//We are looking for volunteers to work on this story with us. Please just leave a comment or contact @awight or anyone else from the Technical Wishes team directly, if you are interested :)//
The [[ https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View | Two-Column-Edit-Conflict-View extension ]] is a (soon to be default) beta feature that offers a different way to solve edit conflicts. Since [[ https://grafana.wikimedia.org/d/000000213/mediawiki-edit-conflicts?refresh=1m&orgId=1&var-interval=30d&from=now-30d&to=now | most edit conflicts happen in the main namespace ]] the extension is focused on this use case. However, many people are annoyed from running into edit conflicts on talk pages, where all they wanted to do is reply to another person, and have this appear underneath.
As a Wikimedia editor,
I want to see my comment below conflicting other people's comments, whenever I answer at the same time as them,
so that I don't need to deal with edit conflicts
 If there is exactly one change on the page, and the page is a discussion page, and the changes were attempted to be at the exact same spot, then we show users a suggestion to solve this (see mock)
 On the page, there should be an explanatory graphic and text (as in the mock).
 If users click on "apply changes", their text will be pasted immediately under the conflicting one.
 If users choose "No, open the edit conflict page", they will see the usual edit conflict resolution screen of the Two-Col-Conflict extension.
 Below the buttons, there is a preview of how the merged text would look like (ideally rendered as the page that would be produced)
**Nice to haves**
 There is a per wiki configurable message that allows communities to define their edit conflict marker (e.g.** (EC)**). If this was filled for a community, it should be added to the beginning of the user's text.
 If people want to leave the page without choosing either of the two options, they should see a browser warning that their content would be lost.