diff --git a/python-chameleon.spec b/python-chameleon.spec
index 9cc13e4..7e5647c 100644
--- a/python-chameleon.spec
+++ b/python-chameleon.spec
@@ -76,7 +76,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-<<<<<<< HEAD
 * Wed Aug 10 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 2.2-1
 - New upstream release