diff --git a/CMakeLists.txt b/CMakeLists.txt
index 874d65af3d..3632f1e080 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,19 +36,8 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
                 string(REGEX REPLACE "^openmw-[0-9]+\\.([0-9]+).*" "\\1" GIT_VERSION_MINOR "${VERSION}")
                 string(REGEX REPLACE "^openmw-[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" GIT_VERSION_RELEASE "${VERSION}")
 
-<<<<<<< HEAD
-                set(GIT_VERSION "${GIT_VERSION_MAJOR}.${GIT_VERSION_MINOR}.${GIT_VERSION_RELEASE}")
-
-                    set(OPENMW_VERSION_MAJOR ${GIT_VERSION_MAJOR})
-                    set(OPENMW_VERSION_MINOR ${GIT_VERSION_MINOR})
-                    set(OPENMW_VERSION_RELEASE ${GIT_VERSION_RELEASE})
-
-                    set(OPENMW_VERSION_COMMITHASH "${COMMITHASH}")
-                    set(OPENMW_VERSION_TAGHASH "${TAGHASH}")
-=======
                 set(OPENMW_VERSION_COMMITHASH "${COMMITHASH}")
                 set(OPENMW_VERSION_TAGHASH "${TAGHASH}")
->>>>>>> master/refs
 
                 message(STATUS "OpenMW version ${OPENMW_VERSION}")
             else(MATCH)