Fixed diff/merge typos