Inconsistencies around defining FRONTEND

Applying: Remove '#define FRONTEND' hacks.
Using index info to reconstruct a base tree...
M	src/backend/replication/logical/proto.c
M	src/bin/pg_controldata/pg_controldata.c
M	src/bin/pg_resetwal/pg_resetwal.c
M	src/bin/pg_waldump/compat.c
M	src/bin/pg_waldump/pg_waldump.c
M	src/bin/pg_waldump/rmgrdesc.c
M	src/include/access/brin_xlog.h
M	src/include/access/generic_xlog.h
M	src/include/access/gist.h
M	src/include/access/heapam_xlog.h
M	src/include/access/heaptoast.h
M	src/include/access/htup_details.h
M	src/include/access/itup.h
M	src/include/access/xlog.h
M	src/include/access/xloginsert.h
M	src/include/catalog/objectaddress.h
M	src/include/catalog/pg_publication.h
M	src/include/commands/sequence.h
M	src/include/commands/tablespace.h
M	src/include/storage/large_object.h
M	src/include/utils/timestamp.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/timestamp.h
Auto-merging src/include/storage/large_object.h
Auto-merging src/include/commands/tablespace.h
CONFLICT (content): Merge conflict in src/include/commands/tablespace.h
Auto-merging src/include/commands/sequence.h
CONFLICT (content): Merge conflict in src/include/commands/sequence.h
Auto-merging src/include/catalog/pg_publication.h
Auto-merging src/include/catalog/objectaddress.h
CONFLICT (content): Merge conflict in src/include/catalog/objectaddress.h
Auto-merging src/include/access/xloginsert.h
Auto-merging src/include/access/xlog.h
CONFLICT (content): Merge conflict in src/include/access/xlog.h
Auto-merging src/include/access/itup.h
Auto-merging src/include/access/htup_details.h
Auto-merging src/include/access/heaptoast.h
CONFLICT (content): Merge conflict in src/include/access/heaptoast.h
Auto-merging src/include/access/heapam_xlog.h
CONFLICT (content): Merge conflict in src/include/access/heapam_xlog.h
Auto-merging src/include/access/gist.h
CONFLICT (content): Merge conflict in src/include/access/gist.h
Auto-merging src/include/access/generic_xlog.h
Auto-merging src/include/access/brin_xlog.h
Auto-merging src/bin/pg_waldump/rmgrdesc.c
Auto-merging src/bin/pg_waldump/pg_waldump.c
Auto-merging src/bin/pg_waldump/compat.c
Auto-merging src/bin/pg_resetwal/pg_resetwal.c
Auto-merging src/bin/pg_controldata/pg_controldata.c
Auto-merging src/backend/replication/logical/proto.c
Patch failed at 0001 Remove '#define FRONTEND' hacks.

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"