Translations:Extension:Paragraph-based Edit Conflict Interface/9/en

You will see a box with the conflicting changes in one column and an editor with the currently saved version of the text in another column.