diff --git a/packages/extension-focus/src/focus.ts b/packages/extension-focus/src/focus.ts
index 4db133fc..56d8d5fa 100644
--- a/packages/extension-focus/src/focus.ts
+++ b/packages/extension-focus/src/focus.ts
@@ -4,13 +4,7 @@ import { DecorationSet, Decoration } from 'prosemirror-view'
 
 export interface FocusOptions {
   className: string,
-<<<<<<< HEAD
   mode: 'all' | 'deepest' | 'shallowest',
-=======
-  start: 'deep' | 'shallow',
-  exact: boolean,
-  // levels: 'all' | number,
->>>>>>> 2959ace822426d014fe3325f0abef8ca797268f4
 }
 
 export const FocusClasses = Extension.create({