updated mergetool and mergetoolgui