diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8ed760..a4d2b5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,66 +1,45 @@
 
 # Minimum version of CMake required to build this project
 cmake_minimum_required(VERSION 3.0)
 
 # Name of the project
 project(pscsproject)
 
 
 add_executable(pscsproject main.cpp)
 
 
 add_subdirectory(ODElibrary)
-add_subdirectory(lib/googletest)
+
 
 
 target_link_libraries(pscsproject ODElibrary)
 
 
 #add_subdirectory(googletest)
 
 #target_link_libraries(pscsproject googletest)
 
 
 
 find_package (Eigen3 3.3 REQUIRED NO_MODULE)
 target_link_libraries (pscsproject Eigen3::Eigen)
 target_link_libraries (pscsproject gtest_main)
 
-<<<<<<< HEAD
 add_executable(foo tests/foo.cpp)
 target_link_libraries(foo gtest_main pthread)
 # Testing
 include(GoogleTest)
 #enable_testing()
 find_package(GTest)
 if (GTEST_FOUND)
     include_directories(${GTEST_INCLUDE_DIRS})
 
 
     gtest_discover_tests(foo)
     #add_executable(test_histogram tests/test_histogram.cc src/ImageIO.cc)
     #add_executable(test_fft tests/test_fft.cc)
     #target_link_libraries(test_fft ${GTEST_BOTH_LIBRARIES} pthread)
     #gtest_discover_tests(test_fft)
 endif()
-=======
-#add_executable(foo tests/foo.cpp)
-
-
 
-# Testing
-#include(GoogleTest)
-#enable_testing()
-#find_package(GTest)
-#if (GTEST_FOUND)
-#    include_directories(${GTEST_INCLUDE_DIRS})
-#    add_executable(foo tests/foo.cpp)
-#    target_link_libraries(foo ${GTEST_BOTH_LIBRARIES} pthread)
-#    gtest_discover_tests(foo)
-#    #add_executable(test_histogram tests/test_histogram.cc src/ImageIO.cc)
-#    #add_executable(test_fft tests/test_fft.cc)
-#    #target_link_libraries(test_fft ${GTEST_BOTH_LIBRARIES} pthread)
-#    #gtest_discover_tests(test_fft)
-#endif()
-
->>>>>>> fcf9b1b36508d43084330977f781f5bea865ea6d