**Motivation**
Users should be able to merge versions when they encounter an edit conflict. This should be done in the selected paragraph. However, since people should always know that all paragraphs are in theory editable, both show the edit button, just in different states of activity.
[] If a version is not selected, it shows a deactivated (not clickable) edit icon in gray (#72777D)
[] If a version is selected, it shows an active edit icon in black.
[] If the text block is unchanged text, the edit button is always active
See mock F18567479
We want to introduce nodejs browser tests with the JS editing in the interface, the barebone patch provided by Zjelkof could be used as starting point https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/TwoColConflict/+/443117/
The following BDD-ish description could be used as narrative for the browser tests
**Narrative**
As a user I should be able to merge versions when I encounter an edit conflict
**Acceptance Criteria**
**Given**: I am on the merge view
**When**: A version is not selected
**Then**: I see a deactivated (not clickable) edit icon in gray (#72777D)
**Given**: I am on the merge view
**When**: A version selected
**Then**: I see an active edit icon in black
**Given**: I am on the merge view
**And**: A version selected
**When**: Text block is unchanged text
**Then**: The edit button is activated
**Given**: I am on the merge view
**And**: A version selected
**When**: Text block is unchanged text
**Then**: The edit button is activated
**And**: I see a clickable area of the edit button bigger than the icon itself