This extension provides a side-by-side edit merge screen for edit conflict resolution See https://www.mediawiki.org/wiki/Extension:TwoColConflict for technical documentation and more links.