spell check.
fixed a merge issue.