Unfortunate pushing down of expressions below sort

Applying: planner: postpone some non-sort output expressions past Sort
Using index info to reconstruct a base tree...
M	contrib/postgres_fdw/expected/postgres_fdw.out
M	src/backend/optimizer/plan/planner.c
M	src/test/regress/expected/groupingsets.out
M	src/test/regress/expected/join.out
M	src/test/regress/expected/tuplesort.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/tuplesort.out
Auto-merging src/test/regress/expected/join.out
Auto-merging src/test/regress/expected/groupingsets.out
Auto-merging src/backend/optimizer/plan/planner.c
CONFLICT (content): Merge conflict in src/backend/optimizer/plan/planner.c
Auto-merging contrib/postgres_fdw/expected/postgres_fdw.out
Patch failed at 0001 planner: postpone some non-sort output expressions past Sort

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"