Resolve conflict

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