merge and difftool