updated mergetool and sublime preferences