diff --git a/evince.spec b/evince.spec
index 9ae14a7..9892cc0 100644
--- a/evince.spec
+++ b/evince.spec
@@ -243,7 +243,6 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
 
 %changelog
-<<<<<<< HEAD
 * Mon Nov  1 2010 Matthias Clasen <mclasen@redhat.com> - 2.91.1-2
 - Rebuild against newer gtk3