diff --git a/perl-Fsdb.spec b/perl-Fsdb.spec
index 40bf0c8..8c417f3 100644
--- a/perl-Fsdb.spec
+++ b/perl-Fsdb.spec
@@ -88,10 +88,6 @@ find $RPM_BUILD_ROOT -type d -exec chmod g-s {} ';'
 %check
 make test
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 7688bc9f227ecbb25474040bf66965b70f7de723
 %files
 # next line deprecated since rpm 4.4, I'm told.
 # -was-percent-defattr(-,root,root,-)