diff --git a/greybird.spec b/greybird.spec
index e35c5b8..dce0d6c 100644
--- a/greybird.spec
+++ b/greybird.spec
@@ -115,7 +115,6 @@ 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.