Support for 8-byte TOAST values (aka the TOAST infinite loop problem)

Applying: Refactor some TOAST value ID code to use Oid8 instead of Oid
Using index info to reconstruct a base tree...
M	contrib/amcheck/verify_heapam.c
M	src/backend/access/common/toast_internals.c
M	src/backend/access/heap/heaptoast.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/include/access/heaptoast.h
M	src/include/access/tableam.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/tableam.h
Auto-merging src/include/access/heaptoast.h
Auto-merging src/backend/replication/logical/reorderbuffer.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/reorderbuffer.c
Auto-merging src/backend/access/heap/heaptoast.c
Auto-merging src/backend/access/common/toast_internals.c
Auto-merging contrib/amcheck/verify_heapam.c
Patch failed at 0001 Refactor some TOAST value ID code to use Oid8 instead of Oid

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"