Fixing conflicts

src/CMakeLists.txt

@@ -37,12 +37,9 @@ endif()
 
 if(CUDA_FOUND)
 	target_compile_options(numerics PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC} >)
-<<<<<<< HEAD
         if (TEST_COVERAGE)
                 target_compile_options(numerics PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage" >)
         endif()
-=======
->>>>>>> sparse_cl
 endif()
 
 target_include_directories (numerics PUBLIC ${CUDA_INCLUDE_DIRS})