diff --git a/ChangeLog b/ChangeLog
index 49a69e62e..6062fded2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -803,15 +803,10 @@
 	* doc/gramps-manual/fr/figures/*.png: Update figures.
 
 2004-01-31  Don Allingham  <dallingham@users.sourceforge.net>
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
 	* src/PeopleView.py (PeopleView.add_to_person_list): don't attempt to sort the
 	model unless it has be assigned.
-=======
-=======
 	* src/SourceView.py: handle column sorting properly
 	* src/PlaceView.py: handle column sorting properly
->>>>>>> 1.658
 	* src/gramps_main.py: better error messages on database write failure
 	* src/WriteXML.py: better error messages on database write failure
 	* src/GrampsXML.py: better error messages on database write failure
@@ -835,7 +830,6 @@
 2004-01-31  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/PeopleView.py (PeopleView.add_to_person_list): don't attempt to sort the
 	model unless it has be assigned.
->>>>>>> 1.655
 	* src/TransTable.py: make sure returned valued is in unicode format
 	* src/plugins/Ancestors.py: fix InverseNameTypesMap problem
 	* src/plugins/IndivComplete.py: fix InverseNameTypesMap problem.