fix spelling error
merge. conflicts fixed