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

components/AnalyticsDashboard.tsx

@@ -66,7 +66,6 @@ interface AnalyticsDashboardProps {
 export function AnalyticsDashboard({ isAuthenticated }: AnalyticsDashboardProps) {
   const [data, setData] = useState<AnalyticsData | null>(null);
   const [loading, setLoading] = useState(false);
->>>>>>> dev
   const [error, setError] = useState<string | null>(null);
   const [timeRange, setTimeRange] = useState<'7d' | '30d' | '90d' | '1y'>('30d');
   const [showResetModal, setShowResetModal] = useState(false);