BUG #17064: Parallel VACUUM operations cause the error "global/pg_filenode.map contains incorrect checksum"

Applying: Remove control file dependency on 512 byte sectors.
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlog.c
M	src/common/controldata_utils.c
M	src/include/catalog/pg_control.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/pg_control.h
Auto-merging src/common/controldata_utils.c
CONFLICT (content): Merge conflict in src/common/controldata_utils.c
Auto-merging src/backend/access/transam/xlog.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.c
Patch failed at 0001 Remove control file dependency on 512 byte sectors.

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"