diff --git a/python-pyzmq.changes b/python-pyzmq.changes
index 92fd449..57e8c4f 100644
--- a/python-pyzmq.changes
+++ b/python-pyzmq.changes
@@ -31,7 +31,6 @@ Mon Dec  5 13:14:57 UTC 2011 - toddrme2178@gmail.com
 - Added python3 subpackage
 
 -------------------------------------------------------------------
->>>>>>> .new
 Mon Sep 26 12:38:30 UTC 2011 - cfarrell@suse.com
 
 - license update: LGPL-3.0+