This image shows the Merge editor where User 1 and User 2’s changes conflict. The Merge editor displays both versions side by side with the merge differences highlighted. The Merge editor contains buttons to resolve, take the change, or abort the merge.