Modify chili-recipe
resolve conflict