diff --git a/libgee.spec b/libgee.spec
index cb37649..9323053 100644
--- a/libgee.spec
+++ b/libgee.spec
@@ -96,8 +96,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
-* Fri Sep 17 2010 Michel Salim <salimma@fedoraproject.org> - 0.5.3-1
+<<<<<<< HEAD
+* Thu Sep 23 2010 Michel Salim <salimma@fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3
+- Rebuild against newer gobject-introspection
 
 * Wed Aug 25 2010 Brian Pepple <bpepple@fedoraproject.org> - 0.5.2-2
 - Add BR on gobject-introspection-devel.