diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 48c1893e5..51275de81 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.5.0)
 project(UltraVNC LANGUAGES C CXX RC)
 
 set(CMAKE_CXX_STANDARD 14)
-<<<<<<< HEAD
 if (MINGW)
     set(CMAKE_C_FLAGS "-Wno-write-strings")
     set(CMAKE_CXX_FLAGS "-Wno-write-strings -Wno-conversion-null")
@@ -36,16 +35,10 @@ add_subdirectory(createpassword)
 add_subdirectory(ldapauth)
 add_subdirectory(ldapauth9x)
 add_subdirectory(ldapauthnt4)
-=======
-set(CMAKE_C_FLAGS "-Wno-write-strings")
-set(CMAKE_CXX_FLAGS "-Wno-write-strings -Wno-conversion-null")
-
->>>>>>> 0e6f1f7b (Catch up with the cmake files the recent changes to the VC project files. (#206))
 add_subdirectory(libomnithread)
 add_subdirectory(librdr)
 add_subdirectory(libudt4)
 add_subdirectory(libudtcloud)
-<<<<<<< HEAD
 add_subdirectory(libzip32)
 add_subdirectory(libzipunzip)
 add_subdirectory(logging)
@@ -59,13 +52,6 @@ add_subdirectory(testauth)
 add_subdirectory(uvnc_settings)
 add_subdirectory(uvnckeyboardhelper)
 add_subdirectory(vnchooks)
-=======
-add_subdirectory(libuvncsettings)
-add_subdirectory(libzip32)
-add_subdirectory(libzipunzip)
-add_subdirectory(repeater)
-add_subdirectory(uvnc_settings)
->>>>>>> 0e6f1f7b (Catch up with the cmake files the recent changes to the VC project files. (#206))
 add_subdirectory(vncviewer)
 add_subdirectory(winvnc)
 add_subdirectory(workgrpdomnt4)
diff --git a/cmake/libuvncsettings/CMakeLists.txt b/cmake/libuvncsettings/CMakeLists.txt
deleted file mode 100644
index c1e6b407e..000000000
--- a/cmake/libuvncsettings/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-set(LIBUVNCSETTINGS_SOURCES
-    capture.cpp
-    connections.cpp
-    filetransfer.cpp
-    firewall.cpp
-    log.cpp
-    misc.cpp
-    network.cpp
-    security.cpp
-    service.cpp
-)
-add_library(libuvncsettings STATIC)
-target_include_directories(libuvncsettings PRIVATE "${CMAKE_SOURCE_DIR}/../DSMPlugin")
-target_include_directories(libuvncsettings PRIVATE "${CMAKE_SOURCE_DIR}/../omnithread")
-foreach(file ${LIBUVNCSETTINGS_SOURCES})
-    target_sources(libuvncsettings PRIVATE "${CMAKE_SOURCE_DIR}/../uvnc_settings/uvnc_settings/${file}")
-endforeach(file)