updated mergetool config