diff --git a/include/mimalloc.h b/include/mimalloc.h
index 2cdded9f..988537c5 100644
--- a/include/mimalloc.h
+++ b/include/mimalloc.h
@@ -8,7 +8,11 @@ terms of the MIT license. A copy of the license can be found in the file
 #ifndef MIMALLOC_H
 #define MIMALLOC_H
 
+<<<<<<< HEAD
 #define MI_MALLOC_VERSION 201   // major + 2 digits minor
+=======
+#define MI_MALLOC_VERSION 171   // major + 2 digits minor
+>>>>>>> dev
 
 // ------------------------------------------------------
 // Compiler specific attributes