I really like the new tool! Excellent work; light-years ahead of the earlier UX while resolving an edit conflict.
Topic on Help talk:Paragraph-based Edit Conflict Interface
Thank you for the nice feedback. Sadly other user also had quite some problems with this approach, therefore we are currently starting from scratch developing a new, hopefully even better approach.
You can find a video demonstating it here:
I hope you are satisfied by this too.