Topic on Help talk:Paragraph-based Edit Conflict Interface

I hit an edit conflict and the merge was complicated. I decided the best thing to do was to get the changes between my version and the version I was originally changing, and then reapply those changes to the current version. But it appears there's no option to get my wikitext back intact; I can only get it in little pieces around where the edit conflicts are. -- ~~~~

Ah,I found a way to do this, but it was not where I expected. Normally the button to show changes or go back to the text you were editing is at the bottom of the form, near the "Preview" and "Publish" buttons. In the beta, it's actually next to the title of the revision, between the preview and the diff conflict resolution area.