update with mergetool