add ingredient list
resolve merge conflic
add notes, completed config