diff --git a/python-mutagen.spec b/python-mutagen.spec
index 177496a..618d291 100644
--- a/python-mutagen.spec
+++ b/python-mutagen.spec
@@ -132,7 +132,6 @@ pushd %{py3dir}
 %endif
 
 %changelog
-<<<<<<< HEAD
 * Fri Dec 23 2016 Michele Baldessari <michele@acksyn.org> - 1.36-1
 - New upstream release