Merging in two commits