diff --git a/WHATSNEW b/WHATSNEW
index 96c812145..ac84acb29 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -418,9 +418,8 @@ Changes from Ant 1.4.1 to 1.5beta1
 Changes that could break older environments:
 --------------------------------------------
 
-<<<<<<< WHATSNEW
 * Important: Single $ signs are no longer silently stripped!
-=======
+
 * The filesetmanifest attribute added to <jar> after the 1.4.1 
   release has been removed for now.  This change may affect only
   the 1.5Beta/1.6Alpha users.  An attempt will be made to add this