diff --git a/libgee.spec b/libgee.spec
index 9323053..a408f06 100644
--- a/libgee.spec
+++ b/libgee.spec
@@ -96,7 +96,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
-<<<<<<< HEAD
 * Thu Sep 23 2010 Michel Salim <salimma@fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3
 - Rebuild against newer gobject-introspection