Temporary tables versus wraparound... again

Applying: Add warnings when old temporary tables are found to still be in use during autovacuum. Long lived sessions using temporary tables are required to vacuum them themselves.
Using index info to reconstruct a base tree...
M	src/backend/access/transam/varsup.c
M	src/backend/catalog/namespace.c
M	src/backend/postmaster/autovacuum.c
M	src/include/catalog/namespace.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/namespace.h
CONFLICT (content): Merge conflict in src/include/catalog/namespace.h
Auto-merging src/backend/postmaster/autovacuum.c
CONFLICT (content): Merge conflict in src/backend/postmaster/autovacuum.c
Auto-merging src/backend/catalog/namespace.c
Auto-merging src/backend/access/transam/varsup.c
CONFLICT (content): Merge conflict in src/backend/access/transam/varsup.c
Patch failed at 0001 Add warnings when old temporary tables are found to still be in use during autovacuum. Long lived sessions using temporary tables are required to vacuum them themselves.

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"