Fix recipe conflict