committing after a merge