diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7cf73c65391c57482d149095cd3748f48f7e748..5fffec1309e4527e58cf5e0ce90d2895c888632d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,12 +81,8 @@ string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
 
 #find dependencies.
 # ============EXAMPLE==================
-<<<<<<< Updated upstream
-FIND_PACKAGE(wolfcore REQUIRED)
-FIND_PACKAGE(Eigen3 3.3 REQUIRED)
-=======
 FIND_PACKAGE(wolfcore REQUIRED CONFIG)
->>>>>>> Stashed changes
+FIND_PACKAGE(Eigen3 3.3 REQUIRED CONFIG)
 
 # Define the directory where will be the configured config.h
 SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal)