outlining diff and merge