diff --git a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt
index 568a4005a1c..d65ecb7d1f0 100644
--- a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt
+++ b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt
@@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.1...3.15)
 project(Poisson_surface_reconstruction_3_Tests)
 
 # Find CGAL
-<<<<<<< HEAD
 find_package(CGAL REQUIRED)
 
 # VisualC++ optimization for applications dealing with large data
@@ -29,32 +28,13 @@ if(MSVC)
       "USING RELEASE EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_RELEASE}'"
   )
 endif()
-=======
-find_package(CGAL QUIET)
-
-if ( CGAL_FOUND )
-
-  # VisualC++ optimization for applications dealing with large data
-  if (MSVC)
-    # Allow Windows 32bit applications to use up to 3GB of RAM
-    SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
-
-    # Prints new compilation options
-    message( STATUS "USING DEBUG CXXFLAGS   = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}'" )
-    message( STATUS "USING DEBUG EXEFLAGS   = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_DEBUG}'" )
-    message( STATUS "USING RELEASE CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}'" )
-    message( STATUS "USING RELEASE EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_RELEASE}'" )
-  endif()
-
   # Temporary debugging stuff
-
   find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
   include(CGAL_Eigen_support)
   if(TARGET CGAL::Eigen_support)
     # Executables that require Eigen 3.1
-    create_single_source_cgal_program( "poisson_reconstruction_test.cpp" )
+    create_single_source_cgal_program("poisson_reconstruction_test.cpp")
     target_link_libraries(poisson_reconstruction_test PUBLIC CGAL::Eigen_support)
-
     find_package(TBB)
     include(CGAL_TBB_support)
     if (TBB_FOUND)
@@ -64,23 +44,5 @@ if ( CGAL_FOUND )
       message(STATUS "NOTICE: test with parallel Mesh_3 needs TBB and will not be compiled.")
     endif()
   else()
-
     message(STATUS "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled.")
->>>>>>> cgal/master
-
-# Temporary debugging stuff
-
-find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
-include(CGAL_Eigen_support)
-if(TARGET CGAL::Eigen_support)
-  # Executables that require Eigen 3.1
-  create_single_source_cgal_program("poisson_reconstruction_test.cpp")
-  target_link_libraries(poisson_reconstruction_test PUBLIC CGAL::Eigen_support)
-else()
-
-  message(
-    STATUS
-      "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled."
-  )
-
 endif()