diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 735b1c56c31..233a72e79df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -131,7 +131,6 @@
 	* subr.el (with-silent-modifications): Don't bind deactivate-mark,
 	buffer-file-name, and buffer-file-truename any more.
 
->>>>>>> MERGE-SOURCE
 2014-04-08  Leo Liu  <sdl.web@gmail.com>
 
 	Use lexical-binding and require cl-lib.