Update chili recipe.
Solve conflict.