Merge resolution
Finished adding words
Spell checked and added final touches