User Story:: As a user, I want to get rid of edits I do not like, so I can start anew or avoid problems

Context of use: The user would use the 2nd version of the 2ColConflict (the line-based-merge) and has edited one of the "select version" text fragments but wants to reset the edit.

Current Problems: Currently, the warning for the reset says:

Discard changes? Your text will be reset to what it was when the edit conflict occurred.

However, it is unclear what "text" is concerned: Just the line edit (I think this it is) or the whole text? The latter is frightening.

Possible Solution: One way to improve the situation for the user is

(Emphasis for highlighting the change, not for formatting of the message)

Discard changes? Your text of this conflicting line will be reset to what it was when the edit conflict occurred

Also, we should be clear to what the text is reset to: "their" or "my" version? This depends on the side of the conflict you reset (which switches the name in [user] to the user name of the other party or to your name)

Discard changes? The text of [user]’s version of this conflicting line will be reset to its state when the conflict occurred