diff --git a/libcomps.spec b/libcomps.spec
index fb82d91..aca5a28 100644
--- a/libcomps.spec
+++ b/libcomps.spec
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-%global commit 257459634117baa067c3dde2a8ea83def6851094
-=======
 %global commit 4951a3ec8b8e9a210471c4d42be370a310cc78ab
->>>>>>> master
 
 Name:           libcomps
 Version:        0.1.2
@@ -120,13 +116,8 @@ rm -rf $buildroot
 
 
 %changelog
-<<<<<<< HEAD
-* Thu Aug 08 2013 Jindrich Luza <jluza@redhat.com> 0.1.2.git2574596
-- spec modified
-=======
 * Wed Aug 14 2013 Jindrich Luza <jluza@redhat.com> 0.1.2.git4951a3e
 - __test.py print removed
->>>>>>> master
 
 * Thu Jul 18 2013 Jindrich Luza <jluza@redhat.com> 0.1.2
 - automatic changelog system