diff -U3 /tmp/cirrus-ci-build/src/test/modules/test_ddl_deparse/expected/alter_table.out /tmp/cirrus-ci-build/src/test/modules/test_ddl_deparse/results/alter_table.out
--- /tmp/cirrus-ci-build/src/test/modules/test_ddl_deparse/expected/alter_table.out	2025-12-13 06:27:02.697891827 +0000
+++ /tmp/cirrus-ci-build/src/test/modules/test_ddl_deparse/results/alter_table.out	2025-12-13 06:33:01.146145229 +0000
@@ -41,41 +41,41 @@
 NOTICE:  merging constraint "a_pos" with inherited definition
 NOTICE:  DDL test: type alter table, tag ALTER TABLE
 NOTICE:    subcommand: type ADD CONSTRAINT (and recurse) desc constraint a_pos on table parent
+<<<<<<< HEAD
+=======
 CREATE TABLE part (
 	a int
 ) PARTITION BY RANGE (a);
-NOTICE:  DDL test: type simple, tag CREATE TABLE
+ERROR:  syntax error at or near "<<<<<<<"
+LINE 1: <<<<<<< HEAD
+        ^
 CREATE TABLE part1 PARTITION OF part FOR VALUES FROM (1) to (100);
-NOTICE:  DDL test: type simple, tag CREATE TABLE
+ERROR:  relation "part" does not exist
 CREATE TABLE part2 (a int);
 NOTICE:  DDL test: type simple, tag CREATE TABLE
 ALTER TABLE part ATTACH PARTITION part2 FOR VALUES FROM (101) to (200);
-NOTICE:  DDL test: type alter table, tag ALTER TABLE
-NOTICE:    subcommand: type ATTACH PARTITION desc table part2
+ERROR:  relation "part" does not exist
 ALTER TABLE part DETACH PARTITION part2;
-NOTICE:  DDL test: type alter table, tag ALTER TABLE
-NOTICE:    subcommand: type DETACH PARTITION desc table part2
+ERROR:  relation "part" does not exist
 DROP TABLE part2;
 CREATE TABLE part2 PARTITION OF part FOR VALUES FROM (100) to (200);
-NOTICE:  DDL test: type simple, tag CREATE TABLE
+ERROR:  relation "part" does not exist
 ALTER TABLE part MERGE PARTITIONS (part1, part2) INTO part1;
-NOTICE:  DDL test: type alter table, tag ALTER TABLE
-NOTICE:    subcommand: type MERGE PARTITIONS desc <NULL>
+ERROR:  relation "part" does not exist
 ALTER TABLE part SPLIT PARTITION part1 INTO
 	(PARTITION part1 FOR VALUES FROM (1) to (100),
 	 PARTITION part2 FOR VALUES FROM (100) to (200));
-NOTICE:  DDL test: type alter table, tag ALTER TABLE
-NOTICE:    subcommand: type SPLIT PARTITION desc <NULL>
+ERROR:  relation "part" does not exist
 ALTER TABLE part ADD PRIMARY KEY (a);
-NOTICE:  DDL test: type alter table, tag ALTER TABLE
-NOTICE:    subcommand: type ADD CONSTRAINT (and recurse) desc constraint part_a_not_null on table part
-NOTICE:    subcommand: type ADD INDEX desc index part_pkey
+ERROR:  relation "part" does not exist
+>>>>>>> d927e9b683f (Implement ALTER TABLE ... MERGE PARTITIONS ... command)
 ALTER TABLE parent ALTER COLUMN a SET NOT NULL;
-NOTICE:  DDL test: type alter table, tag ALTER TABLE
-NOTICE:    subcommand: type SET NOT NULL (and recurse) desc constraint parent_a_not_null on table parent
+ERROR:  syntax error at or near ">>>>>>>"
+LINE 1: >>>>>>> d927e9b683f (Implement ALTER TABLE ... MERGE PARTITI...
+        ^
 ALTER TABLE parent ALTER COLUMN a DROP NOT NULL;
 NOTICE:  DDL test: type alter table, tag ALTER TABLE
-NOTICE:    subcommand: type DROP NOT NULL (and recurse) desc column a of table parent
+NOTICE:    subcommand: type DROP NOT NULL (and recurse) desc <NULL>
 ALTER TABLE parent ALTER COLUMN a SET NOT NULL;
 NOTICE:  DDL test: type alter table, tag ALTER TABLE
 NOTICE:    subcommand: type SET NOT NULL (and recurse) desc constraint parent_a_not_null on table parent