custom meal list and adapter
merged conflict