spelling changes
fixing merge