in the event of a merge conflict, present a modal dialog

provide options for choosing one of the conflicting versions over the other.

Only users who have made changes should see the dialog or have the option of settling the conflict