changed diff and merge tool