diff --git a/dbms/src/Functions/tests/gtest_arithmetic_functions.cpp b/dbms/src/Functions/tests/gtest_arithmetic_functions.cpp
index bd18a70e36b..cf922c82743 100644
--- a/dbms/src/Functions/tests/gtest_arithmetic_functions.cpp
+++ b/dbms/src/Functions/tests/gtest_arithmetic_functions.cpp
@@ -103,8 +103,6 @@ class TestBinaryArithmeticFunctions : public DB::tests::FunctionTest
     }
 };
 
-<<<<<<< HEAD
-=======
 template <typename TYPE>
 void doTiDBDivideDecimalRoundInternalTest()
 {
@@ -241,7 +239,6 @@ try
 }
 CATCH
 
->>>>>>> c6d55aff39 (fix(expr): round decimal divide result when return type is Int512 (#7035))
 TEST_F(TestBinaryArithmeticFunctions, TiDBDivideDecimal)
 try
 {