Fix: Approve database migration

src/components/moderation/ConflictResolutionDialog.tsx

@@ -8,6 +8,7 @@ import { AlertCircle } from 'lucide-react';
 import { type DependencyConflict, type SubmissionItemWithDeps } from '@/lib/submissionItemsService';
 import { useToast } from '@/hooks/use-toast';
 import { useAuth } from '@/hooks/useAuth';
+import { getErrorMessage } from '@/lib/errorHandler';
 
 interface ConflictResolutionDialogProps {
   open: boolean;
@@ -67,10 +68,11 @@ export function ConflictResolutionDialog({
       
       onResolve();
       onOpenChange(false);
-    } catch (error: any) {
+    } catch (error) {
+      const errorMsg = getErrorMessage(error);
       toast({
         title: 'Error',
-        description: error.message || 'Failed to resolve conflicts',
+        description: errorMsg,
         variant: 'destructive',
       });
     }