Opening the Merge Editor from Files with Conflicts: A file with a conflict will now automatically show an "Open in Merge Editor" button to transition between the text and merge editors. Merge Editor ...