MediaWiki:Explainconflict

Montserrat Usually, we are able to solve this automatically, but the changes made led to an edit conflict which needs to be resolved manually by the user.

Montserrat
 * Below this dialog is an editor containing the current revision of the page as it stands currently.
 * Below the editor you will find the differences box. This is what you will use to copy changes up to the editor.
 * Using the differences box, copy the text highlighted in yellow and paste them into the corresponding modified section in the editor.
 * Once finished, press "$1" to save your changes.