diff --git a/python-chameleon.spec b/python-chameleon.spec
index 4a42709..9cc13e4 100644
--- a/python-chameleon.spec
+++ b/python-chameleon.spec
@@ -76,6 +76,7 @@ rm -rf %{buildroot}
 
 
 %changelog
+<<<<<<< HEAD
 * Wed Aug 10 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 2.2-1
 - New upstream release
 
@@ -83,6 +84,9 @@ rm -rf %{buildroot}
 - New upstream release
 - This release removes the genshi-like syntax support -- F17+, only
 
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.12-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sat Sep 18 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.2.12-4
 - Move COPYING file out of the ast directory and into docdir.