Fix remaining merge conflicts and linter errors

- Remove merge conflict markers from AnalyticsDashboard.tsx
- Fix merge conflicts in email/respond/route.tsx
- Use dev versions of EmailManager and ModernAdminDashboard
- Add eslint-disable for Image icon in editor

app/api/email/respond/route.tsx

@@ -319,8 +319,6 @@ const emailTemplates = {
             </body>
             </html>
         `
-<<<<<<< HEAD
-=======
     },
     reply: {
         subject: "Antwort auf deine Nachricht 📧",
@@ -419,11 +417,7 @@ export async function POST(request: NextRequest) {
         const body = (await request.json()) as {
             to: string;
             name: string;
-<<<<<<< HEAD
-            template: 'welcome' | 'project' | 'quick';
-=======
             template: 'welcome' | 'project' | 'quick' | 'reply';
->>>>>>> dev
             originalMessage: string;
         };
         

app/editor/page.tsx

@@ -567,6 +567,7 @@ function EditorPageContent() {
                     className="p-2 rounded-lg text-gray-300"
                     title="Image"
                   >
+                    {/* eslint-disable-next-line jsx-a11y/alt-text */}
                     <Image className="w-4 h-4" />
                   </button>
                 </div>