diff --git a/icinga2.spec b/icinga2.spec
index f761386..4f0b064 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -97,11 +97,7 @@ License:        GPLv2+
 %endif # suse
 Group:          System/Monitoring
 Name:           icinga2
-<<<<<<< HEAD
-Version: 2.11.0
-=======
 Version:        2.11.2
->>>>>>> 2.11
 Release:        %{revision}%{?dist}
 Url:            https://www.icinga.com/
 Source:         https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz