diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a103a5e7..6b42c3102 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,11 +32,7 @@ if(NOT CMAKE_USE_PTHREADS_INIT)
     message(FATAL_ERROR "A POSIX threads (pthread) implementation is required, but was not found.")
 endif()
 
-<<<<<<< HEAD
 set(SLS_LOG_MAX_REPORTING_LEVEL "sls::TLogLevel::logINFO" CACHE STRING "Set the maximum logging level for the project")
-=======
-set(SLS_LOG_MAX_REPORTING_LEVEL sls::logINFO CACHE STRING "set logging level")
->>>>>>> 3ec0a9337 (added compile option to set log level)
 
 option(SLS_USE_SYSTEM_ZMQ "Use system installed libzmq" OFF)
 
@@ -341,14 +337,11 @@ endif()
 # to control options for the libraries
 if(NOT TARGET slsProjectOptions)
     add_library(slsProjectOptions INTERFACE)
-    target_compile_features(slsProjectOptions INTERFACE cxx_std_17)
-    target_compile_definitions(slsProjectOptions
+   target_compile_features(slsProjectOptions INTERFACE cxx_std_17)
+   target_compile_definitions(slsProjectOptions
     INTERFACE LOG_MAX_REPORTING_LEVEL=${SLS_LOG_MAX_REPORTING_LEVEL})
 endif()
 
-target_compile_definitions(slsProjectOptions
-    INTERFACE LOG_MAX_REPORTING_LEVEL=${SLS_LOG_MAX_REPORTING_LEVEL}
-)
 
 if (NOT TARGET slsProjectWarnings)
     add_library(slsProjectWarnings INTERFACE)
diff --git a/slsDetectorServers/matterhonServer/CMakeLists.txt b/slsDetectorServers/matterhonServer/CMakeLists.txt
index 93f017fed..8dbca46fb 100644
--- a/slsDetectorServers/matterhonServer/CMakeLists.txt
+++ b/slsDetectorServers/matterhonServer/CMakeLists.txt
@@ -3,6 +3,7 @@ add_executable(matterhornDetectorServer_virtual
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornApp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornServer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornClientInterface.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/StopServer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/CommandLineOptions.cpp
 )