add food and ingredients
resolve merge conflicts