diff --git a/python-sphinx.spec b/python-sphinx.spec
index 5742275..af96bf1 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -155,7 +155,6 @@ make test
 
 
 %changelog
-<<<<<<< HEAD
 * Thu Apr  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.0.8-2
 - BR on texlive-latex for LaTeX tests