diff --git a/src/app/(app)/layout.tsx b/src/app/(app)/layout.tsx
index 08de66a..9c07c07 100644
--- a/src/app/(app)/layout.tsx
+++ b/src/app/(app)/layout.tsx
@@ -11,7 +11,6 @@ export default function RootLayout({
 }: Readonly<{
 	children: React.ReactNode;
 }>) {
-<<<<<<< HEAD
 	const { isMobile, isSafari } = useDevice();
 	return (
 		<main>
@@ -33,26 +32,4 @@ export default function RootLayout({
 			) : null}
 		</main>
 	);
-=======
-
-    const { isMobile, isSafari } = useDevice();
-    return (
-        <main className="card grid grid-rows-[1fr_auto]">
-
-            <Image 
-                src="/drinkhappylogo.png"
-                alt="Drink Happy Logo Image"
-                width={500}
-                height={500}
-                className="h-auto mx-auto w-1/3"
-            />
-            {children}
-            { isMobile && isSafari ? (
-                <div className="fixed bottom-0 left-0 right-0 z-50 bg-white border-t border-gray-300">
-                    <MobileNav />
-                </div>
-            ) : null }
-        </main>
-    );
->>>>>>> 3361d0451f88d7bbe1a241b09f5cc013c2abf8f7
 }
diff --git a/src/app/(app)/page.tsx b/src/app/(app)/page.tsx
index db20099..d923670 100644
--- a/src/app/(app)/page.tsx
+++ b/src/app/(app)/page.tsx
@@ -42,7 +42,6 @@ function Web() {
 				Welcome, {session?.name || "NULL"} !!
 			</h1>
 
-<<<<<<< HEAD
 			{isAuthenticated ? (
 				<div>
 					<button type="button" className="btn bg-surface-500">
@@ -59,23 +58,6 @@ function Web() {
 					</button>
 				</div>
 			)}
-=======
-			<div className="card preset-tonal-success items-center gap-4 p-4 lg:grid-cols-[1fr_auto]">
-				<div className="gap-1">
-					<button type="button" className="btn hover:preset-tonal">
-						<a href="/auth/login?screen_hint=signup">Sign up</a>
-					</button>
-				</div>
-			</div>
-
-			<div className="card preset-tonal-success items-center gap-4 p-4 lg:grid-cols-[1fr_auto]">
-				<div className="gap-1">
-					<button type="button" className="btn hover:preset-tonal">
-						<a href="/auth/login?screen_hint=login">Log in</a>
-					</button>
-				</div>
-			</div>
->>>>>>> 3361d0451f88d7bbe1a241b09f5cc013c2abf8f7
 		</main>
 	);
 }