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.{{BSExtensionInfobox
|desc=Showing a side-by-side edit merge screen for edit conflict resolution
|status=stable
|developer=Wikimedia Germany (WMDE)
|type=MediaWiki
|edition=BlueSpice free, BlueSpice pro, BlueSpice Farm, BlueSpice Cloud
|active=Yes
|compatible=MediaWiki
|category=Editor
|license=GPL v2+
|docu=https://www.mediawiki.org/wiki/Extension:TwoColConflict
}}
Tbd...
{{MWlink|https://www.mediawiki.org/wiki/Extension:TwoColConflict}}
[[Category:Extension]]
[[Category:BlueSpice free]]