From e03a86a9bbba4aa44eda48fe3817cac104d3984c Mon Sep 17 00:00:00 2001
From: Benjamin Admin <benjaminadmin@MacBook-Pro.local>
Date: Mon, 11 May 2026 11:48:30 +0200
Subject: [PATCH] fix: resolve merge conflict in sidebar

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 admin-compliance/components/sdk/Sidebar/SidebarModuleList.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/admin-compliance/components/sdk/Sidebar/SidebarModuleList.tsx b/admin-compliance/components/sdk/Sidebar/SidebarModuleList.tsx
index fea85f2..165b197 100644
--- a/admin-compliance/components/sdk/Sidebar/SidebarModuleList.tsx
+++ b/admin-compliance/components/sdk/Sidebar/SidebarModuleList.tsx
@@ -38,7 +38,6 @@ export function SidebarModuleList({ collapsed, projectId, pendingCRCount }: Side
         <AdditionalModuleItem href="/sdk/email-templates" icon={<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>} label="E-Mail-Templates" isActive={pathname === '/sdk/email-templates'} collapsed={collapsed} projectId={projectId} />
       </div>
 
-<<<<<<< HEAD
       {/* Master Controls Browser */}
       <AdditionalModuleItem
         href="/sdk/master-controls"
@@ -54,8 +53,6 @@ export function SidebarModuleList({ collapsed, projectId, pendingCRCount }: Side
         projectId={projectId}
       />
 
-=======
->>>>>>> feat/zeroclaw-compliance-agent
       {/* Maschinenrecht / CE */}
       <div className="border-t border-gray-100 py-2">
         {!collapsed && (