Expression errors with "FOR UPDATE" and postgres_fdw with partition wise join enabled.

Applying: Allow partition-wise join when reltarget contains whole row vars
Using index info to reconstruct a base tree...
M	src/backend/optimizer/path/allpaths.c
M	src/backend/optimizer/plan/setrefs.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/optimizer/plan/setrefs.c
CONFLICT (content): Merge conflict in src/backend/optimizer/plan/setrefs.c
Auto-merging src/backend/optimizer/path/allpaths.c
Patch failed at 0001 Allow partition-wise join when reltarget contains whole row vars

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"