diff --git a/scribus.spec b/scribus.spec
index ae583da..c0854c8 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,5 +1,4 @@
 Name:           scribus
-<<<<<<< HEAD
 Version:        1.4.1
 Release:        1%{?dist}