diff --git a/ChangeLog b/ChangeLog
index 999965ad5e..1c13948f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,7 +27,6 @@ Wed Nov 30 23:52:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
 	  fixed: [ruby-dev:27896]
 
->>>>>>> 1.4819
 Wed Nov 30 13:43:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of