Spell check
Solved conflict