TwoColConflict-help-dialog-slide1

This page helps you to resolve an edit conflict. There are two columns: The first shows the conflicting changes and the second is a text editor, whose content will be published.

Feedback is very much appreciated here.