diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01664c9..e6fe291 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,13 +2,10 @@ cmake_minimum_required(VERSION 3.14)
 project(limereport)
 
 set(LIMEREPORT_VERSION_MAJOR 1)
-<<<<<<< HEAD
-set(LIMEREPORT_VERSION_MINOR 6)
-set(LIMEREPORT_VERSION_RELEASE 8)
-=======
+
 set(LIMEREPORT_VERSION_MINOR 7)
 set(LIMEREPORT_VERSION_RELEASE 7)
->>>>>>> b4b2da83307b17610728ba18fba062abc897edc0
+
 
 option(ENABLE_ZINT "Enable libzint build for barcode support" OFF)
 option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF)