Custom reloptions in TableAM

Applying: Custom reloptions for Table AM
Using index info to reconstruct a base tree...
M	src/backend/access/common/reloptions.c
M	src/backend/access/heap/heapam_handler.c
M	src/backend/commands/createas.c
M	src/backend/commands/tablecmds.c
M	src/backend/tcop/utility.c
M	src/include/access/reloptions.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/reloptions.h
CONFLICT (content): Merge conflict in src/include/access/reloptions.h
Auto-merging src/backend/tcop/utility.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/createas.c
Auto-merging src/backend/access/heap/heapam_handler.c
Auto-merging src/backend/access/common/reloptions.c
Patch failed at 0001 Custom reloptions for Table AM

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"