Modify chili-recipe.txt
fix merge conflict