Additional message in pg_terminate_backend

Applying: message in pg_terminate_backend and pg_cancel_backend
Using index info to reconstruct a base tree...
M	doc/src/sgml/func/func-admin.sgml
M	src/backend/storage/ipc/ipci.c
M	src/backend/storage/ipc/signalfuncs.c
M	src/backend/tcop/postgres.c
M	src/backend/utils/init/postinit.c
M	src/include/catalog/pg_proc.dat
M	src/test/modules/test_misc/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_misc/meson.build
CONFLICT (content): Merge conflict in src/test/modules/test_misc/meson.build
Auto-merging src/include/catalog/pg_proc.dat
CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/init/postinit.c
Auto-merging src/backend/tcop/postgres.c
CONFLICT (content): Merge conflict in src/backend/tcop/postgres.c
Auto-merging src/backend/storage/ipc/signalfuncs.c
Auto-merging src/backend/storage/ipc/ipci.c
CONFLICT (content): Merge conflict in src/backend/storage/ipc/ipci.c
Auto-merging doc/src/sgml/func/func-admin.sgml
Patch failed at 0001 message in pg_terminate_backend and pg_cancel_backend

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"