psql single-step mode woes

Applying: Improvements to psql --single-step mode
Using index info to reconstruct a base tree...
M	src/bin/psql/common.c
M	src/bin/psql/mainloop.c
M	src/bin/psql/tab-complete.in.c
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/bin/psql/tab-complete.in.c
Auto-merging src/bin/psql/mainloop.c
Auto-merging src/bin/psql/common.c
CONFLICT (content): Merge conflict in src/bin/psql/common.c
Patch failed at 0001 Improvements to psql --single-step mode

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"