diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 23e62fb1df..b8492a93fc 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -22,11 +22,8 @@
   export let rowCount
   export let disableSorting = false
   export let customPlaceholder = false
-<<<<<<< HEAD
   export let allowEditing = true
-=======
   export let allowClickRows
->>>>>>> origin/develop
 
   const dispatch = createEventDispatcher()