diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index c2aa9270829..fd02f6ac40d 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2000-04-26  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcconfig.h (SPARC): Define ALIGNMENT to 8 for 64bit SPARC.