diff --git a/ChangeLog b/ChangeLog
index 6a12a1ed8..8a63b9607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -201,7 +201,6 @@
  	the default WM so the gnome-wm script can write the chosen WM
 	there.
 
->>>>>>> 1.178
 1999-03-22  Jonathan Blandford  <jrb@redhat.com>
 
 	* capplets/screensaver-properties/: removed print statements.
@@ -212,7 +211,6 @@ Sun Mar 21 01:33:55 CST 1999 Frank Belew <frb@umr.edu>
 	* capplets/gnome-edit-properties/gnome-edit-properties.c:
 	  added Nedit to the list
 
->>>>>>> 1.174
 Tue Mar 16 17:54:04 1999 Timur Bakeyev <mc@bat.ru>
 
 	* capplets/wm-properties/wm-list.c: Add missed #include <sys/types.h>