diff --git a/cmake/mimalloc-config-version.cmake b/cmake/mimalloc-config-version.cmake
index 76b2af6c..acbd0f70 100644
--- a/cmake/mimalloc-config-version.cmake
+++ b/cmake/mimalloc-config-version.cmake
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 set(mi_version_major 2)
 set(mi_version_minor 0)
-set(mi_version_patch 4)
-=======
-set(mi_version_major 1)
-set(mi_version_minor 7)
 set(mi_version_patch 5)
->>>>>>> dev
 set(mi_version ${mi_version_major}.${mi_version_minor})
 
 set(PACKAGE_VERSION ${mi_version})