diff --git a/ChangeLog b/ChangeLog
index db6bfe0..eab6019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -166,13 +166,10 @@ Version 1.8.0
 	* Nicholas Kraft's patch to fix some IPv6 copy/paste issues. He
 	reported to be getting infinite loops with the svn code.
 
-<<<<<<< HEAD
 2008-06-13 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* SF Bug Tracker [ 1984541 ]
 	ixmlDocumenttoString does not render the namespace tag.
 	Submitted By: Beliveau - belivo
-=======
->>>>>>> c155d3c... Bug fix on M-SEARCH for IPv6 CPs.
 
 	Undoing the patch that fixed this problem. In fact, there was no
 	problem and the patch was wrong.