This image shows the diff and merge process.