diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7777db7..9c90c25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,11 @@
+<<<<<<< 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
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/)