diff --git a/apps/rowboat/app/lib/components/editable-field.tsx b/apps/rowboat/app/lib/components/editable-field.tsx
index f29b0946..ca924225 100644
--- a/apps/rowboat/app/lib/components/editable-field.tsx
+++ b/apps/rowboat/app/lib/components/editable-field.tsx
@@ -19,13 +19,10 @@ interface EditableFieldProps {
     className?: string;
     validate?: (value: string) => { valid: boolean; errorMessage?: string };
     light?: boolean;
-<<<<<<< HEAD
     mentions?: boolean;
     mentionsAtValues?: Match[];
-=======
     showSaveButton?: boolean;
     error?: string | null;
->>>>>>> 0ddd390 (Refactor components and use in scenarios pages)
 }
 
 export function EditableField({