fix: accepted git conflicts

src/app/editor/[projectId]/page.tsx

@@ -27,9 +27,25 @@ export default async function EditorPage({ params }: PageProps) {
     .single()
 
   if (error || !project) {
-    return (
-      <div className="flex h-screen flex-col">
-        <header className="flex items-center border-b border-zinc-200 bg-white px-4 py-3 dark:border-zinc-700 dark:bg-zinc-900">
+    notFound()
+  }
+
+  const rawData = project.flowchart_data || {}
+  const flowchartData: FlowchartData = {
+    nodes: rawData.nodes || [],
+    edges: rawData.edges || [],
+    characters: rawData.characters || [],
+    variables: rawData.variables || [],
+  }
+
+  // Migration flag: if the raw data doesn't have characters/variables arrays,
+  // the project was created before these features existed and may need auto-migration
+  const needsMigration = !rawData.characters && !rawData.variables
+
+  return (
+    <div className="flex h-screen flex-col">
+      <header className="flex items-center justify-between border-b border-zinc-200 bg-white px-4 py-3 dark:border-zinc-700 dark:bg-zinc-900">
+        <div className="flex items-center gap-4">
           <Link
             href="/dashboard"
             className="text-zinc-600 hover:text-zinc-900 dark:text-zinc-400 dark:hover:text-zinc-50"
@@ -78,6 +94,14 @@ export default async function EditorPage({ params }: PageProps) {
             </Link>
           </div>
         </div>
+      </header>
+
+      <div className="flex-1">
+        <FlowchartEditor
+          projectId={project.id}
+          initialData={flowchartData}
+          needsMigration={needsMigration}
+        />
       </div>
     )
   }