diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 601343a73ce..a326e8a7ef0 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -26,10 +26,6 @@
 #ifdef HAVE_FCONVERT
 #include <floatingpoint.h>
 #endif
-<<<<<<< TREE
-=======
-
->>>>>>> MERGE-SOURCE
 #include "sql_string.h"
 
 /*****************************************************************************