MediaWiki:Explainconflictmerged

Warning: Someone else has changed this page since you started editing it.

The upper text area contains the merged version, containing your and their changes together. Conflicting changes inside it are marked with <<<<<<<, |||||||, =======, >>>>>>>. The lower text area contains the page text as it currently exists. Resolve conflicts before saving. Only the text in the upper text area will be saved when you press "Save page".