diff --git a/src/app/components/PageLayout.tsx b/src/app/components/PageLayout.tsx
index 975a9d7..3bdef51 100644
--- a/src/app/components/PageLayout.tsx
+++ b/src/app/components/PageLayout.tsx
@@ -34,17 +34,10 @@ export default function PageLayout({
         </div>
       )}
       
-<<<<<<< HEAD
       {/* Main content now participates in normal document flow */}
       <div className="flex-1 relative z-10 w-full flex flex-col">
         <PageTransitionEffect>{children}</PageTransitionEffect>
       </div>
-=======
-      {/* Main content grows to fill available space */}
-      <main className="flex-1 relative z-10 w-full overflow-y-auto">
-        {children}
-      </main>
->>>>>>> 6ebe4eed3d7f8ef6bedea5dcf742bc73462a8af8
       
       {showFooter && (
         <div className="relative z-50 flex-shrink-0">