Add Ingredient Picker
Resolve conflicts