diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
index 4ff95d6..fb95b8e 100644
--- a/test/unittest/CMakeLists.txt
+++ b/test/unittest/CMakeLists.txt
@@ -8,11 +8,8 @@ set(UNITTEST_SOURCES
     itoatest.cpp
     jsoncheckertest.cpp
     namespacetest.cpp
-<<<<<<< HEAD
     pointertest.cpp
-=======
     prettywritertest.cpp
->>>>>>> master
     readertest.cpp
 	simdtest.cpp
     stringbuffertest.cpp