diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 121a0b19..d631ccc6 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -10,13 +10,5 @@ add_subdirectory(matrix)
 add_subdirectory(vector)
 add_subdirectory(utilities)
 add_subdirectory(memory)
-<<<<<<< HEAD
-<<<<<<< HEAD
 add_subdirectory(params)
 add_subdirectory(hykkt)
-=======
-#add_subdirectory(hykkt)
->>>>>>> 857f284 (Disable building HyKKT.)
-=======
-add_subdirectory(hykkt)
->>>>>>> 48c55ce (Rework hykkt cmake altogether, hello world test works.)