add diff and merge tool