diff --git a/mod_security_crs.spec b/mod_security_crs.spec
index ff2f8ce..1c00ad6 100644
--- a/mod_security_crs.spec
+++ b/mod_security_crs.spec
@@ -1,11 +1,7 @@
 Summary: ModSecurity Rules
 Name: mod_security_crs
 Version: 2.2.5
-<<<<<<< HEAD
-Release: 4%{?dist}
-=======
 Release: 5%{?dist}
->>>>>>> master
 License: ASL 2.0
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -69,12 +65,9 @@ rm -rf %{buildroot}
 %{_prefix}/lib/modsecurity.d/slr_rules
 
 %changelog
-<<<<<<< HEAD
-=======
 * Thu Sep 13 2012 Athmane Madjoudj <athmane@fedoraproject.org> 2.2.5-5
 - Enable extra rules sub-package for EPEL.
 
->>>>>>> master
 * Tue Aug 28 2012 Athmane Madjoudj <athmane@fedoraproject.org> 2.2.5-4
 - Fix spec for el5