diff --git a/python-fasteners.spec b/python-fasteners.spec
index 1321dc8..c9b51b6 100644
--- a/python-fasteners.spec
+++ b/python-fasteners.spec
@@ -111,7 +111,6 @@ nosetests-3.4
 
 
 %changelog
-<<<<<<< HEAD
 * Mon Jun 22 2015 Matthias Runge <mrunge@redhat.com> - 0.12.0-1
 - update to 0.12.0 (rhbz#1234253)