add step and ingredients list
merge conflict