diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c90c25..6ff37fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,5 @@
-<<<<<<< Updated upstream
-cmake_minimum_required(VERSION 3.21)
-project(math_approx VERSION 1.0.0 LANGUAGES CXX)
-=======
 cmake_minimum_required(VERSION 3.18)
-project(math_approx)
-set(CMAKE_CXX_STANDARD 20)
->>>>>>> Stashed changes
+project(math_approx VERSION 1.0.0 LANGUAGES CXX)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/)