Add more details about merging and merge commits