Solved conflicts popular food + about us

solved style and html code problems