diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44c87c1f..ed50cd7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,11 +27,7 @@ endif()
 
 # ############
 # Define Project
-<<<<<<< Updated upstream
-project(triqs_dft_tools VERSION 3.3.0 LANGUAGES C CXX Fortran)
-=======
-project(triqs_dft_tools VERSION 3.2.0 LANGUAGES CXX Fortran)
->>>>>>> Stashed changes
+project(triqs_dft_tools VERSION 3.3.0 LANGUAGES CXX Fortran)
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 
 # ############