updated mergetool settings