diff --git a/ChangeLog b/ChangeLog
index 445cbfbd03..3758530394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,18 +53,17 @@
 
 	* src/gnome/dialog-column-view.c: more libglade work
 
+2001-06-13  Bill Gribble  <grib@billgribble.com>
+
+	* src/sc/qif-import/qif-guess-map.scm: fix bug in 
+	account name guessing 
+
 2001-06-12  Dave Peticolas  <dave@krondo.com>
 
 	* src/gnome/glade/report.glade: new file for old report dialogs
 
 	* src/gnome/dialog-column-view.c: use libglade
 
->>>>>>> 1.616
-2001-06-13  Bill Gribble  <grib@billgribble.com>
-
-	* src/sc/qif-import/qif-guess-map.scm: fix bug in 
-	account name guessing 
-
 2001-06-12  Dave Peticolas  <dave@krondo.com>
 
 	* src/gnome/dialog-price-editor.c: fix bug