merge conflict

Author: abhikaboy

frontend/app/(restaurant)/[id].tsx

@@ -20,8 +20,11 @@ import { Skeleton } from "moti/skeleton";
 import { getRestaurantReviews, getRestaurantReviewsByUser, getReviews } from "@/api/reviews";
 import { TReview } from "@/types/review";
 import { useUser } from "@/context/user-context";
+<<<<<<< HEAD
 import { TMenuItem } from "@/types/menu-item";
 import { getMenuItemsByRestaurant } from "@/api/menu-items";
+=======
+>>>>>>> origin
 
 export default function Route() {
     const restaurantTags = ["Fast Food", "Fried Chicken", "Chicken Sandwiches", "Order Online"];
@@ -60,10 +63,13 @@ export default function Route() {
             setReviews(res);
         });
 
+<<<<<<< HEAD
         getMenuItemsByRestaurant(id).then((res) => {
             setMenuItems(res);
         });
 
+=======
+>>>>>>> origin
         getRestaurantReviewsByUser(id, user.id).then((res) => {
             console.log(res);
             setMyReviews(res);

frontend/app/(tabs)/index/index.tsx

@@ -95,7 +95,7 @@ export default function Feed() {
                     // use the recommendations endpoint to get the top 10 items
                     const topItems = await getRecommendations(user?.id);
                     // convert top items _id to id
-                    topItems.forEach((item) => (item.id = item._id));
+                    topItems.forEach((item) => (item.id = item.id));
                     console.log(topItems);
                     setFeedItems(topItems.map((item) => ({ id: item.id, type: "menuItem", data: item })));
                     break;