diff --git a/tests/unit/switch_core.c b/tests/unit/switch_core.c
index eaf7082b119..d23dd254a9b 100644
--- a/tests/unit/switch_core.c
+++ b/tests/unit/switch_core.c
@@ -53,7 +53,6 @@ FST_CORE_BEGIN("./conf")
 		}
 		FST_TEARDOWN_END()
 
-<<<<<<< HEAD
 
 		FST_TEST_BEGIN(test_switch_regex)
 		{