I have just posted a suggestion to meta. I think we should get rid of
the "Edit Conflict" screen.
http://meta.wikimedia.org/wiki/Edit_conflict_handling_suggestion
In summary, the idea is to allow anyone (including experienced users) to
resolve an edit conflict (which a newbie might not be able to).
Please discuss. :-)
Timwi