diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index e6aa030859f..bde01a648f9 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -1144,7 +1144,6 @@
    ...
    fun:pthread_create*
 }
-<<<<<<< HEAD
 
 {
    Memory Leak in loader and valgrind malloc