more ingredients
resolving conflict