The old merge mode that appears in the document window when co-authoring has been replaced with a new conflict resolution ...