minor typo changes to nb
dealing with merge