Hi there,
just by coincidence I had an edit conflict last week and used the updated "two column edit conflict view" – as I was positively surprised. I really like the view, the possibility to switch between wiki text view and wysiwyg/visual view and – especially – the possibility to edit directly in this view.
Thanks a lot for your work!