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/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>