diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffa7d2ed4..31bc9948d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,10 +112,6 @@ if (WIN32)
   list (APPEND YLIBS    $<TARGET_OBJECTS:YapC++>)
 endif()
 
-<<<<<<< HEAD
-	
-=======
->>>>>>> 6aaa32363c7e98297e48a79ea03ae55de59fbdb3
 
 add_component (core
   ${ENGINE_SOURCES}