diff --git a/python-coverage.spec b/python-coverage.spec
index 0a8d1ae..ef2b650 100644
--- a/python-coverage.spec
+++ b/python-coverage.spec
@@ -118,7 +118,6 @@ popd
 
 
 %changelog
-<<<<<<< HEAD
 * Mon Sep 28 2015 Tom Callaway <spot@fedoraproject.org> - 4.0-1
 - update to 4.0 final