diff --git a/ChangeLog b/ChangeLog
index efb3c9a630..7696b5e6ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,7 +51,6 @@
 	* gst-libs/gst/audio/audio.h:
 	  remove some deprecated functions
 
->>>>>>> 1.2127
 2005-11-22  Andy Wingo  <wingo@pobox.com>
 
 	* Update for gst_tag_setter API changes.