spelling and syntax
merge conflicts