diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010
index 17579f2ea170..5105230cf051 100644
--- a/doc/CHANGES-2010
+++ b/doc/CHANGES-2010
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.131 2010/01/16 16:35:16 wiz Exp $
+$NetBSD: CHANGES-2010,v 1.132 2010/01/16 16:37:35 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -84,9 +84,7 @@ Changes to the packages collection and infrastructure in 2010:
 	Updated sysutils/cdrtools to 2.01.01alpha70 [wiz 2010-01-15]
 	Updated games/rftg to 0.6.0 [wiz 2010-01-15]
 	Updated security/pam_ssh_agent_auth to 0.9.2 [agc 2010-01-15]
-<<<<<<< CHANGES-2010
 	Updated math/nickle to 2.69 [tnn 2010-01-15]
-=======
 	Updated mail/sendmail to 8.14.4 [jnemeth 2010-01-16]
 	Updated mail/libmilter to 8.14.4 [jnemeth 2010-01-16]
 	Updated devel/libthai to 0.1.13 [obache 2010-01-16]