diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 81908e4a1f..71a0f37aaf 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -80,24 +80,11 @@ string(REGEX REPLACE     "${protobuf_VERSION_REGEX}" "\\5"
 
 message(STATUS "${protobuf_VERSION_PRERELEASE}")
 
-message(STATUS "${protobuf_VERSION_PRERELEASE}")
-
 # Package version
 set(protobuf_VERSION
   "${protobuf_VERSION_MAJOR}.${protobuf_VERSION_MINOR}.${protobuf_VERSION_PATCH}")
 
 if(protobuf_VERSION_PRERELEASE)
-<<<<<<<
-=======
-  set(protobuf_VERSION "${protobuf_VERSION}.${protobuf_VERSION_PRERELEASE}")
-else()
-  set(protobuf_VERSION "${protobuf_VERSION}.0")
-endif()
-message(STATUS "${protobuf_VERSION}")
-
-if(protobuf_VERBOSE)
-
->>>>>>>
   set(protobuf_VERSION "${protobuf_VERSION}.${protobuf_VERSION_PRERELEASE}")
 else()
   set(protobuf_VERSION "${protobuf_VERSION}.0")