Doesn't edit conflict show your content at the bottom of the edit conflict page? A bit unintuitive, but should be there.
On Mon, 17 Nov 2014, at 09:07, Pine W wrote:
I have just lost *two hours* of work due to an edit conflict. I thought using my browser's back button would fix it, but the text is gone forever. Argh.