Commiting a merge