From 4c67a9ba1b6aa4d00c2a3ed3862298fb442bd096 Mon Sep 17 00:00:00 2001
From: Sean Lai <seanlai221@gmail.com>
Date: Mon, 2 Dec 2024 18:05:20 -0500
Subject: [PATCH] fixed merge errors

---
 app/layout.tsx | 4 ++++
 app/page.tsx   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/layout.tsx b/app/layout.tsx
index be11f96..1f90450 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -22,6 +22,10 @@ export default function RootLayout({
       <head>
         <meta name="description" content="Tech@NYU" />
         <link rel="icon" href="/favicon.ico" sizes="any" />
+        <meta
+          name="viewport"
+          content="width=device-width, initial-scale=1.0"
+        ></meta>
       </head>
       <body className={inter.className}>
         <ThemeProvider
diff --git a/app/page.tsx b/app/page.tsx
index 480bc1e..ea4aff8 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -13,7 +13,7 @@ import Program_Banner from "@/components/Program_Banner";
 
 const Home = () => {
   return (
-    <main className="relative bg-black-100 flex justify-center items-center flex-colmx-auto sm:px-10 px-5 overflow-clip">
+    <main className="relative bg-black-100 flex justify-center items-center flex-col overflow-hidden mx-auto sm:px-10 px-5 w-full">
       <div className="max-w-7xl w-full">
         <FloatingNav navItems={navItems} />
         <Hero />
