diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 851b9e832c..3e08096152 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -51,11 +51,8 @@
         originalName,
         field,
         primaryDisplay,
-<<<<<<< HEAD
         oneToMany,
-=======
         indexes,
->>>>>>> develop
       })
       return state
     })