meal plan working good
commiting ocnflicts