Edit chili-recipe.txt to make the conflict
Merge remote-tracking branch 'origin/master'