diff --git a/adminfront/src/components/layout/AppLayout.tsx b/adminfront/src/components/layout/AppLayout.tsx
index 22dc3735..5dbf388a 100644
--- a/adminfront/src/components/layout/AppLayout.tsx
+++ b/adminfront/src/components/layout/AppLayout.tsx
@@ -1,28 +1,15 @@
 import {
-<<<<<<< HEAD
   BadgeCheck,
   Building2,
   Key,
   KeyRound,
   LayoutDashboard,
+  LayoutGrid,
   Moon,
   NotebookTabs,
   ShieldHalf,
   Sun,
   Users,
-=======
-    BadgeCheck,
-    Building2,
-    Key,
-    KeyRound,
-    LayoutDashboard,
-    LayoutGrid,
-    Moon,
-    NotebookTabs,
-    ShieldHalf,
-    Sun,
-    Users,
->>>>>>> d7d2e16 (feat: 테넌트 그룹(Tenant Group) 기능 구현 #239)
 } from "lucide-react";
 import { useEffect, useState } from "react";
 import { NavLink, Outlet } from "react-router-dom";
@@ -30,28 +17,18 @@ import { t } from "../../lib/i18n";
 import RoleSwitcher from "./RoleSwitcher";
 
 const navItems = [
-<<<<<<< HEAD
   { label: "ui.admin.nav.overview", to: "/", icon: LayoutDashboard },
   {
     label: "ui.admin.nav.tenant_dashboard",
     to: "/dashboard",
     icon: ShieldHalf,
   },
+  { label: "ui.admin.nav.tenant_groups", to: "/tenant-groups", icon: LayoutGrid },
   { label: "ui.admin.nav.tenants", to: "/tenants", icon: Building2 },
   { label: "ui.admin.nav.users", to: "/users", icon: Users },
   { label: "ui.admin.nav.api_keys", to: "/api-keys", icon: Key },
   { label: "ui.admin.nav.audit_logs", to: "/audit-logs", icon: NotebookTabs },
   { label: "ui.admin.nav.auth_guard", to: "/auth", icon: KeyRound },
-=======
-    { label: "Overview", to: "/", icon: LayoutDashboard },
-    { label: "Tenant Dashboard", to: "/dashboard", icon: ShieldHalf },
-    { label: "Tenant Groups", to: "/tenant-groups", icon: LayoutGrid },
-    { label: "Tenants", to: "/tenants", icon: Building2 },
-    { label: "Users", to: "/users", icon: Users },
-    { label: "API Keys (M2M)", to: "/api-keys", icon: Key },
-    { label: "Audit Logs", to: "/audit-logs", icon: NotebookTabs },
-    { label: "Auth Guard", to: "/auth", icon: KeyRound },
->>>>>>> d7d2e16 (feat: 테넌트 그룹(Tenant Group) 기능 구현 #239)
 ];
 
 function AppLayout() {
@@ -183,4 +160,4 @@ function AppLayout() {
   );
 }
 
-export default AppLayout;
+export default AppLayout;
\ No newline at end of file