Resolved merge conflicts

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "workbench.colorCustomizations": {
+    "panel.border": "#fedd7c"
+  }
+}

docker-compose.yml

@@ -11,9 +11,8 @@ services:
       - NEXT_WEBPACK_USEPOLLING=1
     ports:
       - '3000:3000'
-      - '5555:5555'
     volumes:
-      # - .:/usr/src/app
+      - .:/usr/src/app
       - /usr/src/app/.next
       - /usr/src/app/node_modules
     depends_on:
@@ -35,8 +34,8 @@ services:
     healthcheck:
       test: [ 'CMD-SHELL', 'pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}' ]
       interval: 10s
-      timeout: 5s
+      timeout: 10s
       retries: 5
 
 volumes:
-  postgres-data:
+  postgres-data:

src/components/BreadCrumbComponent.tsx

@@ -60,7 +60,7 @@ export default function BreadCrumbComponent({
       <Breadcrumb>
         <BreadcrumbList>
           <BreadcrumbItem>
-            <BreadcrumbLink className="text-sm text-blue-600" asChild>
+            <BreadcrumbLink className="text-blue-600" asChild>
               <Link href={'/'}>
                 <Home className="size-4" />
               </Link>
@@ -72,7 +72,7 @@ export default function BreadCrumbComponent({
               <BreadcrumbLink className="text-blue-600" asChild>
                 <Link
                   href={`/courses/${course.id}`}
-                  className="text-sm font-semibold capitalize text-primary/60"
+                  className="text-xs font-semibold capitalize text-primary/60"
                 >
                   {course.title}
                 </Link>

src/components/CourseView.tsx

@@ -104,4 +104,4 @@ export const CourseView = ({
       ) : null}
     </div>
   );
-};
+};

src/components/Sidebar.tsx

@@ -309,4 +309,4 @@ function Check({ content }: { content: any }) {
       className="focus:ring-none h-4 w-4 rounded-md border-primary/10"
     />
   );
-}
+}

src/components/admin/AddContent.tsx

@@ -315,4 +315,4 @@ function AddVideoMetadata({ onChange }: { onChange: (metadata: any) => void }) {
       />
     </div>
   );
-}
+}

src/components/admin/UpdateVideoClient.tsx

@@ -250,4 +250,4 @@ export const UpdateVideoClient = ({
       </Accordion>
     </div>
   );
-};
+};