Committing in preparation of merge