diff --git a/src/app/editor/[projectId]/page.tsx b/src/app/editor/[projectId]/page.tsx
index ca5abda..f261d4a 100644
--- a/src/app/editor/[projectId]/page.tsx
+++ b/src/app/editor/[projectId]/page.tsx
@@ -42,7 +42,7 @@ export default async function EditorPage({ params }: PageProps) {
   // the project was created before these features existed and may need auto-migration
   const needsMigration = !rawData.characters && !rawData.variables
 
-  return (
+  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">
@@ -103,6 +103,7 @@ export default async function EditorPage({ params }: PageProps) {
           needsMigration={needsMigration}
         />
       </div>
+    </>
     )
   }
 
diff --git a/src/types/flowchart.ts b/src/types/flowchart.ts
index 9072a34..4f4461c 100644
--- a/src/types/flowchart.ts
+++ b/src/types/flowchart.ts
@@ -4,13 +4,6 @@ export type Position = {
   y: number;
 };
 
-<<<<<<< HEAD
-// Condition type for conditional edges and choice options
-export type Condition = {
-  variableName: string;
-  operator: '>' | '<' | '==' | '>=' | '<=' | '!=';
-  value: number;
-=======
 // Character type: represents a defined character in the project
 export type Character = {
   id: string;
@@ -34,7 +27,6 @@ export type Condition = {
   variableId?: string;
   operator: '>' | '<' | '==' | '>=' | '<=' | '!=';
   value: number | string | boolean;
->>>>>>> ralph/collaboration-and-character-variables
 };
 
 // DialogueNode type: represents character speech/dialogue