diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03f73a4..bfcce46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,4 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fopenmp")
 
 add_library(eigen SHARED ${SOURCES})
 
-<<<<<<< HEAD
 install(TARGETS eigen LIBRARY DESTINATION lib)
-=======
-add_library(eigen SHARED ${SOURCES})
->>>>>>> master