Bugs in TOAST handling, OID assignment and redo recovery

Applying: Clarify TOAST terminology in variables and error messages
Using index info to reconstruct a base tree...
A	src/backend/access/heap/tuptoaster.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/backend/access/heap/tuptoaster.c deleted in HEAD and modified in Clarify TOAST terminology in variables and error messages. Version Clarify TOAST terminology in variables and error messages of src/backend/access/heap/tuptoaster.c left in tree.
Patch failed at 0001 Clarify TOAST terminology in variables and error messages

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"