added diff and merge tests