add diffmerge