diff --git a/functions/strings.xml b/functions/strings.xml
index db389c2b2d..7c8b5d6db7 100644
--- a/functions/strings.xml
+++ b/functions/strings.xml
@@ -3426,27 +3426,15 @@ $text = ucfirst ($text); // $text is now Mary had a little lamb
      </funcprototype>
     </funcsynopsis>
     <para>
-<<<<<<< strings.xml
-<<<<<<< strings.xml
-     Capitalizes the first character of each word in
-		 <parameter>str</parameter> if that character is alphabetic.  A
-		 word is defined as any sequence of non-whitespace letters (of the
-		 current locale)  immediately following a whitespace (space,
-		 horizontal or vertical tab, linefeed or carriage return).
-=======
-     Retuns a string with the first character of each word in
-=======
      Returns a string with the first character of each word in
->>>>>>> 1.83
      <parameter>str</parameter> capitalized, if that character is
      alphabetic.
->>>>>>> 1.77
      <example>
       <title><function>ucwords</function> example</title>
       <programlisting role="php">
-$text = "mary had a little lamb and she loved it so."; $text =
-			 ucwords($text); // $text is now: Mary Had A Little  // Lamb And
-			 She Loved It So.
+$text = "mary had a little lamb and she loved it so.";
+$text = ucwords($text); // $text is now: Mary Had A Little 
+                        // Lamb And She Loved It So.
       </programlisting>
      </example>
      <note>