Spell checking and screenshot.
fixed merge conflict on source file