modify chili-recipe.txt
solv merging conflict