diff --git a/kdevelop.spec b/kdevelop.spec
index 97bb492..4bc7061 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -196,12 +196,6 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 - Update to 4.4.0
 - Rebase no-rpath patch
 
-<<<<<<< HEAD
-* Mon Sep 10 2012 Rex Dieter <rdieter@fedoraproject.org> 9:4.3.1-2
-- rebuild for kde-4.9.x
-
-=======
->>>>>>> f18
 * Fri Sep 07 2012 Radek Novacek <rnovacek@redhat.com> 9:4.3.90-1
 - Update to 4.3.90 (RC 1)