Ugh, gosh darn it, through no fault of yours master has an issue. Fixing in https://github.com/backstage/backstage/pull/6793 - you can rebase on top of that already to be proactive, if you are daring. That way you won't have to wait for it to be merged and _then_ rebase on master and _then_ wait for us to merge yours :)