diff --git a/greybird.spec b/greybird.spec
index b6241a4..e35c5b8 100644
--- a/greybird.spec
+++ b/greybird.spec
@@ -115,10 +115,14 @@ cp -pr gtk-2.0/ gtk-3.0/ metacity-1/ xfwm4/ xfwm4_compact/ xfce-notify-4.0/ %{bu
 %{_datadir}/themes/%{theme_name}/xfce-notify-4.0/
 
 %changelog
+<<<<<<< HEAD
 * Wed Jul 25 2012 Athmane Madjoudj <athmane@fedoraproject.org> 0.9-1
 - Update to the new release.
 - Remove unico engine dep.
 
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Mon Jul 02 2012 Athmane Madjoudj 0.8.2-4
 - Remove unity import in gtk3 css.