fixed minor spelling error
fixed merge conflict