feat: conflict solved#57

yesimsit wants to merge 2 commits intomainReCoded-Org/cookiz-capstone-project:mainfrom

i55-landing_meals_finalReCoded-Org/cookiz-capstone-project:i55-landing_meals_finalCopy head branch name to clipboard