diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3672398b9cc..1c220812d4a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1514,7 +1514,6 @@
 
 	* collect2.c (main):  Handle --no-demangle and --demangle flags.
 
->>>>>>> 2.4547
 2004-07-13  Sebastian Pop  <pop@cri.ensmp.fr>
 
 	* Makefile.in (OBJS-common): Add tree-data-ref.o.