diff --git a/src/ChangeLog b/src/ChangeLog
index e990ac38388..155ed046f77 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -45,7 +45,6 @@
 	* xmenu.c (menu_position_func): Use x_display_pixel_height and
 	x_display_pixel_width.
 
->>>>>>> 1.6978
 2008-09-18  Kenichi Handa  <handa@m17n.org>
 
 	* composite.c (fill_gstring_header): Don't check FROM and TO here.
@@ -151,7 +150,6 @@
 	* indent.c (Fvertical_motion): Be sure to set
 	it_overshoot_expected if it.cmp_it.id is non-nengative.
 
->>>>>>> 1.6977
 2008-09-07  Andreas Schwab  <schwab@suse.de>
 
 	* callproc.c (Fcall_process): Don't hold references to string data