Edited spellchecker
Fixed merge conflict