diff --git a/src/App.tsx b/src/App.tsx
index dd09c45..d69f5ca 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,14 +1,8 @@
 /**
  * App.tsx
-<<<<<<< HEAD
- * 
- * Haupt-App-Komponente mit Multi-Tenant Router-Setup.
- * 
-=======
  *
  * Haupt-App-Komponente mit Multi-Tenant Router-Setup.
  *
->>>>>>> 845094a (feat(realestate): PEK map and address UI, realestate views, feature-instance routes)
  * URL-Struktur:
  * - /                                    → Dashboard/Übersicht
  * - /settings                            → Benutzer-Einstellungen
@@ -36,8 +30,6 @@ import { ProtectedRoute } from './providers/auth/ProtectedRoute';
 import { LanguageProvider } from './providers/language/LanguageContext';
 import { ToastProvider } from './contexts/ToastContext';
 import { WorkflowSelectionProvider } from './contexts/WorkflowSelectionContext';
-import { FileProvider } from './contexts/FileContext';
-
 import { MainLayout } from './layouts/MainLayout';
 import { FeatureLayout } from './layouts/FeatureLayout';
 import { DashboardPage } from './pages/Dashboard';