diff --git a/CMakeLists.txt b/CMakeLists.txt
index c109662..9ca2225 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,16 +68,8 @@ target_include_directories(tests PRIVATE
     ${CURL_INCLUDE_DIRS}
 )
 
-<<<<<<< HEAD
-#target_link_libraries(tests gtest
-#    ${IXWEBSOCKET_LIBRARIES}
-#    ${CURL_LIBRARIES}
-#    gtest_main
-#)
-=======
 target_link_libraries(tests gtest
     ${IXWEBSOCKET_LIBRARIES}
     ${CURL_LIBRARIES}
     gtest_main
 )
->>>>>>> tests