Get merge conflict for class, change chili to add ghost peppers.
Merge remote tracking branch 'origin/master'