diff --git a/highlight.spec b/highlight.spec
index 2797bb9..dad539c 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -34,12 +34,9 @@ Requires:	%{name} = %{version}-%{release}
 A Qt-based GUI for the highlight source code formatter source.
 
 %prep
-<<<<<<< highlight.spec
+
 %setup -q -n %{name}-%{version}-beta
 %patch1 -p1 -b .org
-=======
-%setup -q
->>>>>>> 1.54
 
 # Provides: exclude perl(highlight_pipe) from example
 cat <<__EOF__ > %{name}-perl.prov