Your changes conflict with other changes made to the page.
@@ -42,10 +28,18 @@ Perhaps someone else has deleted it or moved it. If you want to recreate
this page with your text, click "Save Page" again.
+
+
+While you were creating this page, someone else independently created a page
+with the same name.
+
+
+The edit box below contains the page's current content, followed by the
+content you entered previously, to allow you to merge the two
+together before saving.
+
+
-
-/
-
@@ -63,17 +57,16 @@ Page type:
Optional comment about this change:
-
+
+