Parallel INSERT SELECT take 2

Applying: Compute and cache relations' parallel DML safety in relcache
Using index info to reconstruct a base tree...
M	src/backend/optimizer/util/clauses.c
M	src/backend/utils/cache/relcache.c
M	src/include/optimizer/clauses.h
M	src/include/utils/rel.h
M	src/include/utils/relcache.h
M	src/test/modules/Makefile
M	src/test/modules/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/meson.build
Auto-merging src/test/modules/Makefile
Auto-merging src/include/utils/relcache.h
Auto-merging src/include/utils/rel.h
Auto-merging src/include/optimizer/clauses.h
Auto-merging src/backend/utils/cache/relcache.c
CONFLICT (content): Merge conflict in src/backend/utils/cache/relcache.c
Auto-merging src/backend/optimizer/util/clauses.c
Patch failed at 0001 Compute and cache relations' parallel DML safety in relcache

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"