diff --git a/libiscsi.spec b/libiscsi.spec
index 944e21b..276d9f3 100644
--- a/libiscsi.spec
+++ b/libiscsi.spec
@@ -1,12 +1,7 @@
 Name: libiscsi
 Summary: iSCSI client library
-<<<<<<< HEAD
-Version: 1.15.0
-Release: 5%{?dist}
-=======
 Version: 1.18.0
 Release: 1%{?dist}
->>>>>>> Rebased to version 1.18.0
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: https://github.com/sahlberg/%{name}