Index: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1704,9 +1704,9 @@
 	replace the current file with the new one.  For most
 	unmodified files, this is the best option.</para>
 
-      <para>Choosing to merge the file will present a text editor, and
-	the contents of both files.  The files can be merged by
-	reviewing both files side by side on the screen, and choosing
+      <para>Choosing to merge the file will present a text editor with
+	the contents of both files open.  The files can be merged by
+	reviewing both files side by side on the screen and choosing
 	parts from both to create a finished product.  When the files
 	are compared side by side, <keycap>l</keycap> selects the left
 	contents and <keycap>r</keycap> selects contents from the