let ALTER TABLE DROP COLUMN drop whole-row referenced object

Applying: Whole-row fixes for DROP COLUMN, SET COLUMN DATA TYPE
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
M	src/backend/optimizer/util/var.c
M	src/test/regress/expected/indexing.out
M	src/test/regress/expected/rowsecurity.out
M	src/test/regress/expected/triggers.out
M	src/test/regress/sql/indexing.sql
M	src/test/regress/sql/rowsecurity.sql
M	src/test/regress/sql/triggers.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/triggers.sql
Auto-merging src/test/regress/sql/rowsecurity.sql
Auto-merging src/test/regress/sql/indexing.sql
Auto-merging src/test/regress/expected/triggers.out
Auto-merging src/test/regress/expected/rowsecurity.out
Auto-merging src/test/regress/expected/indexing.out
Auto-merging src/backend/optimizer/util/var.c
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Patch failed at 0001 Whole-row fixes for DROP COLUMN, SET COLUMN DATA TYPE

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"