diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 8f6ade8..10f6960 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -928,7 +928,6 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
 * Thu Aug 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-13
 - use upstream commit/fix for QTBUG-46310
 - restore qdoc/gdb hackery, i686 still needs it :(