fix

app/[locale]/(site)/layout.tsx

@@ -3,7 +3,6 @@ import { unstable_noStore as noStore } from "next/cache";
 import { getLocale } from "next-intl/server";
 import { redirect } from "next/navigation";
 
-import { FloatingAdminButton } from "@/components/layout/floating-admin-button";
 import { SiteAmbientBackdrop } from "@/components/layout/site-ambient-backdrop";
 import { PageTransition } from "@/components/layout/page-transition";
 import { SiteDock } from "@/components/layout/site-dock";
@@ -31,7 +30,7 @@ export default async function SiteLayout({ children, params }: SiteLayoutProps)
     getSiteSettings(),
   ]);
   const localeKey = resolveLocale(await getLocale().catch(() => siteSettings.defaultLocale), siteSettings.defaultLocale);
-  // Server-side decision only. The header receives just this boolean and uses
+  // Server-side decision only. The dock receives just this boolean and uses
   // it purely to show/hide the Admin shortcut link — it grants no access by
   // itself. Every admin page/action re-checks the session independently, so
   // this value is not a security boundary, only a UI convenience.
@@ -45,17 +44,7 @@ export default async function SiteLayout({ children, params }: SiteLayoutProps)
     <>
       <ScrollSmootherProvider />
       <SiteAmbientBackdrop />
-<<<<<<< HEAD
       <SiteDock defaultLocale={siteSettings.defaultLocale} isSuperAdmin={authenticated} />
-=======
-      <SiteHeader
-        lightLogoUrl={mediaBindings.siteLogoLight?.url}
-        darkLogoUrl={mediaBindings.siteLogoDark?.url}
-        defaultLocale={siteSettings.defaultLocale}
-        isSuperAdmin={authenticated}
-      />
-      <FloatingAdminButton />
->>>>>>> 9fabf17 (update)
       <div id="smooth-wrapper">
         <div id="smooth-content">
           <div className="site-content-frame flex min-h-screen flex-col">