updated spelling error
updated content
fixed merge conflicts