**Motivation**:
The TwoColConflict extension is a stable extension used by +2K users[1] and already a beta feature on de-wiki, meta, mediawiki.org and finnish wp. It is time to test it on all wikis.
**Time plan:**
The TwoColConflict extension should become a beta feature on all wikis on April 25th. We will then evaluate until latest the end of 2017 whether the extension should be deployed. Due to the nature of edit conflicts happening occasionally and unplanned, we expect a longer feedback time than is needed for other features.
**Background**:
TwoColConflict is the extension resulting of wish # 1 of the German-speaking Community Wishlist (T139601) in 2015. The goal is to improve the UI for resolving edit conflicts. In contrast to the current page, users now have two columns helping them to solve conflicting versions: The first one displays the changes between the version, whereas the other one is a text editor, which can be used on eye level with the changes.
[1]https://grafana.wikimedia.org/dashboard/db/betafeatures