Hi,
Everytime I have an edit conflict, the system asks me which version I want to edit - the current one, or the one that I've been editing. And everytime I make one and the same choice (which is I choose to edit the current version and just copy and paste my own text). So my suggestion is to make it remember my choice to save my (and other experienced editors') time, but leave some descreet option to switch it on the go, if it's technically possible, of course. If it's not, I would like to have such an option in the preferences - thus only really experienced users, who really know what they prefer, would be able to use it.