diff --git a/src/test/regress/expected/bfv_joins_optimizer.out b/src/test/regress/expected/bfv_joins_optimizer.out
index 5ccbccbd1fe..22f7acf5afc 100644
--- a/src/test/regress/expected/bfv_joins_optimizer.out
+++ b/src/test/regress/expected/bfv_joins_optimizer.out
@@ -11,22 +11,14 @@ create table y (a int, b int, c int);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into y (select * from x);
-<<<<<<< HEAD
 CREATE TABLE t1 (a int, b int, c int not null);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
-||||||| parent of e54c349fc1 (Doc: rename old name to Apache Cloudberry)
-CREATE TABLE t1 (a int, b int);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table.
-=======
-CREATE TABLE t1 (a int, b int);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
->>>>>>> e54c349fc1 (Doc: rename old name to Apache Cloudberry)
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 CREATE TABLE t2 (a int, b int);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 CREATE TABLE t3 (a int not null, b int, c int);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Greenplum Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 INSERT INTO t1 VALUES (1,1,1),(2,1,2),(3,NULL,3);
 INSERT INTO t2 VALUES (2,3);
diff --git a/src/test/regress/expected/qp_misc_rio_join_small.out b/src/test/regress/expected/qp_misc_rio_join_small.out
index 98081f0ccdc..e3e1fc5e540 100644
--- a/src/test/regress/expected/qp_misc_rio_join_small.out
+++ b/src/test/regress/expected/qp_misc_rio_join_small.out
@@ -31,7 +31,7 @@ CREATE TABLE my_tt_agg_small (
 --
 COPY my_tt_agg_small (symbol, event_ts, trade_price, trade_volume) FROM stdin;
 --
--- Apache Cloudberry dump complete
+-- Apache Cloudberry database dump complete
 --
 --
 -- Apache Cloudberry database dump