diff --git a/po/ChangeLog b/po/ChangeLog
index 6b9fa3da53..6ad77f09d9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,7 +1,8 @@
 2004-01-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian Nynorsk translation.
-
+	* ChangeLog: Removed leftover conflict indicator.
+	
 2004-01-26  Nikos Charonitakis  <frolix68@yahoo.gr>
 
 	* el.po: Updated Greek translation.
@@ -68,7 +69,6 @@
 	* ru.po: Updated Russian translation
 	from Russian team <gnome-cyr@gnome.org>.
 
->>>>>>> 1.599
 2004-01-21  Artur Flinta  <aflinta@cvs.gnome.org>
 
 	* pl.po: Updated Polish translation by GNOME PL Team.