diff --git a/python-XStatic-jquery-ui.spec b/python-XStatic-jquery-ui.spec
index cfa3fdc..46d9f51 100644
--- a/python-XStatic-jquery-ui.spec
+++ b/python-XStatic-jquery-ui.spec
@@ -136,7 +136,6 @@ rm -rf %{buildroot}%{python3_sitelib}/xstatic/pkg/jquery_ui/data
 %{_jsdir}/jquery_ui
 
 %changelog
-<<<<<<< HEAD
 * Fri Feb 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.10.4.1-10
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)