Spelling.
Fixed minor merge conflict.