IDEA-56303 Git Merge Tool renamed to Resolve Conflicts.