diff --git a/CMakeLists.txt b/CMakeLists.txt
index 275c58b12498d4e1d6c5bd8e97f6dc143ec607ba..27b0dd6db906e42c31e1bd25944d96f81d10b4a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,16 +15,20 @@ add_custom_target(check
 
 # Specify the .cpp files for the executables
 add_executable(ecss_services src/main.cpp src/Message.cpp src/Service.cpp
+<<<<<<< CMakeLists.txt
         src/Services/TestService.cpp 
         src/Services/RequestVerificationService.cpp
         src/Services/MemoryManagementService.cpp
         src/Services/ParameterService.cpp)
+=======
         src/Services/TestService.cpp
         src/Services/RequestVerificationService.cpp)
+>>>>>>> CMakeLists.txt
 
 IF(EXISTS "${PROJECT_SOURCE_DIR}/lib/Catch2/CMakeLists.txt")
     add_subdirectory(lib/Catch2)
     add_executable(tests src/Message.cpp src/Services/TestService.cpp
+<<<<<<< CMakeLists.txt
             src/Services/RequestVerificationService.cpp 
             src/Services/ParameterService.cpp
             src/Services/MemoryManagementService.cpp
@@ -35,6 +39,10 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/lib/Catch2/CMakeLists.txt")
             test/Services/RequestVerificationService.cpp
             test/Services/ParameterService.cpp
             test/Services/MemoryManagementService.cpp)
-
+=======
+    src/Services/RequestVerificationService.cpp
+    test/tests.cpp test/Message.cpp test/TestPlatform.cpp test/Services/TestService.cpp
+    test/Services/RequestVerificationService.cpp)
+>>>>>>> CMakeLists.txt
     target_link_libraries(tests Catch2::Catch2)
 ENDIF()