added sublime text mergetool settings