array_cat anycompatible change is breaking xversion upgrade tests

Applying: Check incompatible aggreagtes and operators before upgrade to 14
Using index info to reconstruct a base tree...
M	src/bin/pg_upgrade/check.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_upgrade/check.c
CONFLICT (content): Merge conflict in src/bin/pg_upgrade/check.c
Patch failed at 0001 Check incompatible aggreagtes and operators before upgrade to 14

/ci/repo/worktrees/worktree/rebase-apply/patch:238: trailing whitespace.
	
/ci/repo/worktrees/worktree/rebase-apply/patch:250: trailing whitespace.
	
warning: 2 lines add whitespace errors.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"