Resolve conflict

Retrieved from "https://community.mspchallenge.info/wiki/MediaWiki:Visualeditor-savedialog-label-resolve-conflict"