The Two Column Edit Conflict View is a new interface for the edit conflict resolution page. It displays colliding text passages in pairs next to each other, making it easier to merge your text with the one that’s currently online.

Showing a side-by-side edit merge screen for edit conflict resolution
Status: stable
Developer: Wikimedia Germany (WMDE)
Extension type: MediaWiki
Edition: BlueSpice free, BlueSpice pro, BlueSpice Farm, BlueSpice Cloud
Dependencies: MediaWiki
License: GPL v2+
Activated: Yes
Category: Editor

For more information please visit MediaWiki.