* Corrected merge error for ingredients update