Fixed spelling errors
fixed spelling errors
Fixed merge conflict