OK now lets try resolving this by manually copying files

CMakeLists.txt

@@ -36,26 +36,10 @@ endif()
 include( SetupEigen3 )
 include( SetupXercesC )
 include( SetupJSON )
-<<<<<<< HEAD
-# Add the GoogleTest framework, for tests
-find_package(GTest REQUIRED)
-include_directories(${GTEST_INCLUDE_DIRS})
-=======
->>>>>>> c4bd7307ff48fd74b49ce31ba11106266ecbbd8a
 
 # Find the dependencies that the project always picks up from its environment.
 find_package( SQLite3 3.7.17 )
 
-<<<<<<< HEAD
-# === Enable testing functionality
-# NOTE: this must be in the root CMakeLists.txt file
-#       even if the tests are defined in CMake files
-#       located in sub-directories.
-enable_testing()
-
-
-=======
->>>>>>> c4bd7307ff48fd74b49ce31ba11106266ecbbd8a
 # === Main targets built by this project ===
 
 # switches to let users build specific packages on request
@@ -63,7 +47,6 @@ option(GEOMODEL_BUILD_ALL "Enable the build of all GeoModel sub-packages" OFF)
 option(GEOMODEL_BUILD_TOOLS "Enable the build of GeoModelTools" OFF)
 option(GEOMODEL_BUILD_EXAMPLES "Enable the build of GeoModelExamples" OFF)
 option(GEOMODEL_BUILD_EXAMPLES_W_GEANT4 "Enable the build of GeoModelExamples, including the ones concerning the interface GeoModel->Geant4" OFF)
-option(GEOMODEL_USE_QT6 "Use QT6 for Visualization and FSL" ON)
 option(GEOMODEL_BUILD_VISUALIZATION "Enable the build of GeoModelVisualization" OFF)
 option(GEOMODEL_BUILD_GEOMODELG4 "Enable the build of GeoModelG4" OFF)
 option(GEOMODEL_BUILD_FULLSIMLIGHT "Enable the build of FullSimLight" OFF)
@@ -71,7 +54,7 @@ option(GEOMODEL_BUILD_FULLSIMLIGHT_PROFILING "Enable FullSimLight profiling targ
 option(GEOMODEL_BUILD_FSL "Enable the build of FSL and FullSimLight" OFF)
 option(GEOMODEL_BUILD_ATLASEXTENSIONS "Build the Custom ATLAS Extensions" OFF)
 option(GEOMODEL_BUILD_TESTING "Build the unit tests of GeoModel" OFF )
-
+option(GEOMODEL_USE_QT6 "Use QT6 for Visualization and FSL" OFF)
 
 include(CTest) # needs to be included at the top level
 if( BUILD_TESTING AND GEOMODEL_BUILD_TESTING )
@@ -94,10 +77,6 @@ endif()
 
 if(GEOMODEL_BUILD_FULLSIMLIGHT_PROFILING)
   set(GEOMODEL_BUILD_FULLSIMLIGHT ON CACHE BOOL "Enable the build of FullSimLight" FORCE)
-<<<<<<< HEAD
-  include(CTest) # needs to be included at the top level
-=======
->>>>>>> c4bd7307ff48fd74b49ce31ba11106266ecbbd8a
 endif()
 
 # a list to keep track of the packages we build
@@ -112,10 +91,7 @@ if(GEOMODEL_BUILD_ALL)
   set(GEOMODEL_BUILD_TOOLS         TRUE)
   set(GEOMODEL_BUILD_VISUALIZATION TRUE)
   set(GEOMODEL_BUILD_FSL           TRUE)
-<<<<<<< HEAD
-=======
   set(GEOMODEL_BUILD_TESTING       TRUE)
->>>>>>> c4bd7307ff48fd74b49ce31ba11106266ecbbd8a
 endif()
 
 if(GEOMODEL_BUILD_TOOLS)