added sample meals
fixed conflict