diff --git a/src/test/regress/expected/func_to_binary_float.out b/src/test/regress/expected/func_to_binary_float.out
index d11c3ad1b..3fcd42402 100644
--- a/src/test/regress/expected/func_to_binary_float.out
+++ b/src/test/regress/expected/func_to_binary_float.out
@@ -445,7 +445,6 @@ SELECT TO_BINARY_FLOAT('  6.66  ' DEFAULT 3.14 ON CONVERSION ERROR);
 SELECT TO_BINARY_FLOAT('today' DEFAULT 'roll' ON CONVERSION ERROR);  -- error
 ERROR:  invalid input syntax for type real
 CONTEXT:  referenced column: to_binary_float
-<<<<<<< HEAD
 SELECT TO_BINARY_FLOAT(3.402E+100);
  to_binary_float 
 -----------------
@@ -458,7 +457,6 @@ SELECT TO_BINARY_FLOAT('test' DEFAULT 3.04E+100 ON CONVERSION ERROR);
         Infinity
 (1 row)
 
-=======
 -- test default column
 SELECT TO_BINARY_FLOAT(1.79E+309 DEFAULT y ON CONVERSION ERROR);
 ERROR:  column "y" does not exist
@@ -563,7 +561,6 @@ CONTEXT:  referenced column: to_binary_float
 SELECT TO_BINARY_FLOAT(NULL DEFAULT c4 ON CONVERSION ERROR) FROM tbf ORDER BY c1; -- error
 ERROR:  default argument must be a literal or bind
 CONTEXT:  referenced column: to_binary_float
->>>>>>> 1073a6efb (修改第二个参数为列引用时的处理逻辑)
 -- test overflow and null
 SELECT TO_BINARY_FLOAT(1.79769313486231E+100 DEFAULT 3.14 ON CONVERSION ERROR);
  to_binary_float