diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt
index b88d59fc..b8568560 100644
--- a/linux/devices/CMakeLists.txt
+++ b/linux/devices/CMakeLists.txt
@@ -4,11 +4,8 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
     )
 endif()
 
-<<<<<<< HEAD
 target_sources(${OBSW_NAME} PRIVATE
 	ScexUartReader.cpp
 )
-=======
 add_subdirectory(ploc)
->>>>>>> origin/develop
 add_subdirectory(startracker)