diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 1a7b217f61..635a52e7da 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -1,10 +1,7 @@
 import { cloneDeep } from "lodash/fp"
 import { get } from "svelte/store"
 import { store } from "builderStore"
-import {
-  tables as tablesStore,
-  queries as queriesStores,
-} from "stores/backend/"
+import { tables as tablesStore, queries as queriesStores } from "stores/backend"
 import { findComponentPath } from "./storeUtils"
 import { makePropSafe } from "@budibase/string-templates"
 import { TableNames } from "../constants"
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index c1727c2e9e..ff551751da 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -15,7 +15,7 @@ import {
   queries,
   database,
   tables,
-} from "stores/backend/"
+} from "stores/backend"
 
 import { fetchComponentLibDefinitions } from "../loadComponentLibraries"
 import api from "../api"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
index 99b843ebc6..48cd1dacc3 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
@@ -1,7 +1,7 @@
 <script>
   import { processStringSync } from "@budibase/string-templates"
   import { get } from "lodash/fp"
-  import { tables } from 'stores/backend/'
+  import { tables } from "stores/backend"
 
   export let block
 
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index 722e5224b0..ff3d751094 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,12 +1,6 @@
 <script>
-<<<<<<< HEAD
-  import { backendUiStore, automationStore } from "builderStore"
   import { goto } from "@roxi/routify"
-=======
-  import { automationStore } from "builderStore"
-  import { database } from 'stores/backend/'
-  import { goto } from "@sveltech/routify"
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { database } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import { Input, ModalContent } from "@budibase/bbui"
   import analytics from "analytics"
diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
index 09c04a61b1..0924fa3a44 100644
--- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
@@ -1,12 +1,7 @@
 <script>
-<<<<<<< HEAD
   import { goto } from "@roxi/routify"
-  import { automationStore, backendUiStore } from "builderStore"
-=======
-  import { goto } from "@sveltech/routify"
   import { automationStore } from "builderStore"
-  import { database } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { database } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu } from "@budibase/bbui"
   import { DropdownContainer, DropdownItem } from "components/common/Dropdowns"
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 6a33666eaf..bee56045ff 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from 'stores/backend/'
+  import { tables } from "stores/backend"
   import { Select } from "@budibase/bbui"
   import DrawerBindableInput from "../../common/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "./AutomationBindingPanel.svelte"
diff --git a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
index 682dd23800..68d5eee0c4 100644
--- a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
@@ -1,6 +1,6 @@
 <script>
   import { automationStore } from "builderStore"
-  import { database } from 'stores/backend/'
+  import { database } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import AutomationBlockSetup from "./AutomationBlockSetup.svelte"
   import { Button, Modal } from "@budibase/bbui"
diff --git a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
index d1176eb9cb..27239088eb 100644
--- a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from 'stores/backend/'
+  import { tables } from "stores/backend"
   import { Select } from "@budibase/bbui"
 
   export let value
diff --git a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
index e4e0a538cf..19cd41e390 100644
--- a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
+++ b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { automationStore } from "builderStore"
-  import { database } from 'stores/backend/'
+  import { database } from "stores/backend"
   import WebhookDisplay from "./WebhookDisplay.svelte"
   import { ModalContent } from "@budibase/bbui"
   import { onMount, onDestroy } from "svelte"
diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index ac4830d57e..8954b00f81 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables, views } from 'stores/backend/'
+  import { tables, views } from "stores/backend"
 
   import CreateRowButton from "./buttons/CreateRowButton.svelte"
   import CreateColumnButton from "./buttons/CreateColumnButton.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/ExternalDataSourceTable.svelte b/packages/builder/src/components/backend/DataTable/ExternalDataSourceTable.svelte
index 9dea9a5dd2..9035e9cb00 100644
--- a/packages/builder/src/components/backend/DataTable/ExternalDataSourceTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ExternalDataSourceTable.svelte
@@ -1,11 +1,4 @@
 <script>
-<<<<<<< HEAD
-  import { params } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-  import { notifier } from "builderStore/store/notifications"
-  import * as api from "./api"
-=======
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
   import Table from "./Table.svelte"
 
   export let query = {}
diff --git a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
index c4b5a4a3a9..635a509e50 100644
--- a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
@@ -1,7 +1,7 @@
 <script>
   import api from "builderStore/api"
   import Table from "./Table.svelte"
-  import { tables } from 'stores/backend/'
+  import { tables } from "stores/backend"
 
   export let tableId
   export let rowId
@@ -12,9 +12,7 @@
 
   $: data = row?.[fieldName] ?? []
   $: linkedTableId = data?.length ? data[0].tableId : null
-  $: linkedTable = $tables.list.find(
-    table => table._id === linkedTableId
-  )
+  $: linkedTable = $tables.list.find(table => table._id === linkedTableId)
   $: schema = linkedTable?.schema
   $: table = $tables.list.find(table => table._id === tableId)
   $: fetchData(tableId, rowId)
diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
index c20f6b2f52..092796b3b5 100644
--- a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
@@ -1,6 +1,6 @@
 <script>
   import api from "builderStore/api"
-  import { tables } from 'stores/backend/'
+  import { tables } from "stores/backend"
 
   import Table from "./Table.svelte"
   import CalculateButton from "./buttons/CalculateButton.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
index c8a4e62d18..6828976c51 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { TextButton, Popover } from "@budibase/bbui"
-  import { permissions } from 'stores/backend/'
+  import { permissions } from "stores/backend"
   import ManageAccessPopover from "../popovers/ManageAccessPopover.svelte"
 
   export let resourceId
@@ -10,9 +10,7 @@
   let resourcePermissions
 
   async function openDropdown() {
-    resourcePermissions = await permissions.forResource(
-      resourceId
-    )
+    resourcePermissions = await permissions.forResource(resourceId)
     dropdown.show()
   }
 </script>
diff --git a/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte b/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
index 8267c2f7d4..9a04933a19 100644
--- a/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
+++ b/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { roles } from 'stores/backend/'
+  import { roles } from "stores/backend"
 
   export let roleId
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 6c74252614..055a0a693b 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -9,7 +9,7 @@
     Radio,
   } from "@budibase/bbui"
   import { cloneDeep } from "lodash/fp"
-  import { tables } from 'stores/backend/'
+  import { tables } from "stores/backend"
 
   import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
   import {
@@ -56,9 +56,7 @@
     UNEDITABLE_USER_FIELDS.includes(field.name)
   $: invalid =
     (field.type === LINK_TYPE && !field.tableId) ||
-    Object.keys($tables.draft.schema).some(
-      key => key === field.name
-    )
+    Object.keys($tables.draft.schema).some(key => key === field.name)
 
   // used to select what different options can be displayed for column type
   $: canBeSearched =
@@ -72,18 +70,14 @@
 
   async function saveColumn() {
     if (field.type === AUTO_COL) {
-      field = buildAutoColumn(
-        $tables.draft.name,
-        field.name,
-        field.subtype
-      )
+      field = buildAutoColumn($tables.draft.name, field.name, field.subtype)
     }
     tables.saveField({
-        originalName,
-        field,
-        primaryDisplay,
-        indexes,
-      })
+      originalName,
+      field,
+      primaryDisplay,
+      indexes,
+    })
     onClosed()
   }
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index 004a8d2470..b50c12bc1f 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables, rows } from 'stores/backend/'
+  import { tables, rows } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import RowFieldControl from "../RowFieldControl.svelte"
   import * as api from "../api"
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index c251595011..56935a9c7b 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { tables, rows } from 'stores/backend/'
-  import { roles } from 'stores/backend/'
+  import { tables, rows } from "stores/backend"
+  import { roles } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import RowFieldControl from "../RowFieldControl.svelte"
   import * as backendApi from "../api"
diff --git a/packages/builder/src/components/backend/DataTable/modals/DeleteRow.svelte b/packages/builder/src/components/backend/DataTable/modals/DeleteRow.svelte
index 29824d4933..6620b57f61 100644
--- a/packages/builder/src/components/backend/DataTable/modals/DeleteRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/DeleteRow.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { rows } from 'stores/backend/'
+  import { rows } from "stores/backend"
   import * as api from "../api"
   import { notifier } from "builderStore/store/notifications"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
index 5ce62c37cc..0984c94e0c 100644
--- a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
@@ -4,16 +4,14 @@
   import api from "builderStore/api"
   import { notifier } from "builderStore/store/notifications"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
-  import { roles } from 'stores/backend/'
+  import { roles } from "stores/backend"
 
   let basePermissions = []
   let selectedRole = {}
   let errors = []
   let builtInRoles = ["Admin", "Power", "Basic", "Public"]
   $: selectedRoleId = selectedRole._id
-  $: otherRoles = $roles.filter(
-    role => role._id !== selectedRoleId
-  )
+  $: otherRoles = $roles.filter(role => role._id !== selectedRoleId)
   $: isCreating = selectedRoleId == null || selectedRoleId === ""
 
   const fetchBasePermissions = async () => {
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
index c1bfed4609..cbfe4a29da 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Button, Select } from "@budibase/bbui"
-  
-  import { tables, views } from 'stores/backend/'
+
+  import { tables, views } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import analytics from "analytics"
 
@@ -23,9 +23,7 @@
   export let view = {}
   export let onClosed
 
-  $: viewTable = $tables.list.find(
-    ({ _id }) => _id === $views.selected.tableId
-  )
+  $: viewTable = $tables.list.find(({ _id }) => _id === $views.selected.tableId)
   $: fields =
     viewTable &&
     Object.keys(viewTable.schema).filter(
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
index 1c6d2177eb..ab4aa9ecae 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
@@ -1,13 +1,8 @@
 <script>
   import { Button, Input } from "@budibase/bbui"
-<<<<<<< HEAD
   import { goto } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { goto } from "@sveltech/routify"
-  import { views as viewsStore } from 'stores/backend/'
-  import { tables } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { views as viewsStore } from "stores/backend"
+  import { tables } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import analytics from "analytics"
 
@@ -16,9 +11,7 @@
   let name
   let field
 
-  $: views = $tables.list.flatMap(table =>
-    Object.keys(table.views || {})
-  )
+  $: views = $tables.list.flatMap(table => Object.keys(table.views || {}))
 
   function saveView() {
     if (views.includes(name)) {
diff --git a/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
index 141afebd96..d32a9866b6 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Button, Input, Select, DatePicker } from "@budibase/bbui"
-  import { tables, views } from 'stores/backend/'
+  import { tables, views } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import analytics from "analytics"
 
@@ -49,9 +49,7 @@
   export let view = {}
   export let onClosed
 
-  $: viewTable = $tables.list.find(
-    ({ _id }) => _id === $views.selected.tableId
-  )
+  $: viewTable = $tables.list.find(({ _id }) => _id === $views.selected.tableId)
   $: fields = viewTable && Object.keys(viewTable.schema)
 
   function saveView() {
diff --git a/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte
index 86b050b4f6..7391e77681 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte
@@ -1,15 +1,13 @@
 <script>
   import { Button, Select } from "@budibase/bbui"
-  import { tables, views } from 'stores/backend/'
+  import { tables, views } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import { FIELDS } from "constants/backend"
 
   export let view = {}
   export let onClosed
 
-  $: viewTable = $tables.list.find(
-    ({ _id }) => _id === $views.selected.tableId
-  )
+  $: viewTable = $tables.list.find(({ _id }) => _id === $views.selected.tableId)
   $: fields =
     viewTable &&
     Object.entries(viewTable.schema)
diff --git a/packages/builder/src/components/backend/DataTable/popovers/ManageAccessPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/ManageAccessPopover.svelte
index b3650fd988..a3fc4fc355 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/ManageAccessPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/ManageAccessPopover.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { roles, permissions as permissionsStore } from 'stores/backend/'
+  import { roles, permissions as permissionsStore } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import { Button, Label, Input, Select, Spacer } from "@budibase/bbui"
 
@@ -15,9 +15,7 @@
     })
 
     // Show updated permissions in UI: REMOVE
-    permissions = await permissionsStore.forResource(
-      resourceId
-    )
+    permissions = await permissionsStore.forResource(resourceId)
     notifier.success("Updated permissions.")
     // TODO: update permissions
     // permissions[]
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index c927d9f28a..e4984af4f6 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -1,12 +1,7 @@
 <script>
   import { onMount } from "svelte"
-<<<<<<< HEAD
   import { goto } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { goto } from "@sveltech/routify"
-  import { database, datasources, queries } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { database, datasources, queries } from "stores/backend"
   import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
   import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
index 00269ceb37..27a058cd5d 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
@@ -1,11 +1,6 @@
 <script>
-<<<<<<< HEAD
-  import { goto, params } from "@roxi/routify"
-  import { backendUiStore, store } from "builderStore"
-=======
-  import { goto } from "@sveltech/routify"
-  import { datasources } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { goto } from "@roxi/routify"
+  import { datasources } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import { Input, Label, ModalContent } from "@budibase/bbui"
   import TableIntegrationMenu from "../TableIntegrationMenu/index.svelte"
@@ -19,9 +14,7 @@
   function checkValid(evt) {
     const datasourceName = evt.target.value
     if (
-      $datasources?.list.some(
-        datasource => datasource.name === datasourceName
-      )
+      $datasources?.list.some(datasource => datasource.name === datasourceName)
     ) {
       error = `Datasource with name ${datasourceName} already exists. Please choose another name.`
       return
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
index 9a09e30f62..216cc2cfdb 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
@@ -1,11 +1,6 @@
 <script>
-<<<<<<< HEAD
   import { goto } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { goto } from "@sveltech/routify"
-  import { datasources } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { datasources } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index c9f7db2ab3..baaa01fc85 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -1,18 +1,12 @@
 <script>
-<<<<<<< HEAD
   import { goto } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { goto } from "@sveltech/routify"
-  import { tables, views, database } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { tables, views, database } from "stores/backend"
   import { TableNames } from "constants"
   import EditTablePopover from "./popovers/EditTablePopover.svelte"
   import EditViewPopover from "./popovers/EditViewPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
 
-  $: selectedView =
-    $views.selected && $views.selected.name
+  $: selectedView = $views.selected && $views.selected.name
 
   function selectTable(table) {
     tables.select(table)
@@ -33,7 +27,6 @@
       ...table.views[viewName],
     })
   }
-  
 </script>
 
 {#if $database?._id}
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index a72b6cfab6..5c9559088a 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -1,12 +1,7 @@
 <script>
-<<<<<<< HEAD
   import { goto } from "@roxi/routify"
-  import { backendUiStore, store } from "builderStore"
-=======
-  import { goto } from "@sveltech/routify"
   import { store } from "builderStore"
-  import { tables } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { tables } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import { Input, Label, ModalContent, Toggle } from "@budibase/bbui"
   import TableDataImport from "../TableDataImport.svelte"
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index 5fd7ff764a..3209932308 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -1,12 +1,7 @@
 <script>
-<<<<<<< HEAD
   import { goto } from "@roxi/routify"
-  import { backendUiStore, store, allScreens } from "builderStore"
-=======
-  import { goto } from '@sveltech/routify'
   import { store, allScreens } from "builderStore"
-  import { tables } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { tables } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu, Button, Input } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
@@ -62,9 +57,10 @@
 
   function checkValid(evt) {
     const tableName = evt.target.value
-    error = originalName !== tableName
-      ? `Table with name ${tableName} already exists. Please choose another name.`
-      : ""
+    error =
+      originalName !== tableName
+        ? `Table with name ${tableName} already exists. Please choose another name.`
+        : ""
   }
 </script>
 
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
index f6e0dcf616..68f16d3c74 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
@@ -1,11 +1,6 @@
 <script>
-<<<<<<< HEAD
   import { goto } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { goto } from "@sveltech/routify"
-  import { views } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
+  import { views } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu, Button, Input } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index 32f0b74ca9..272d4fc4b7 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from 'stores/backend/'
+  import { tables } from "stores/backend"
   import api from "builderStore/api"
   import { Select, Label, Multiselect } from "@budibase/bbui"
   import { capitalise } from "../../helpers"
@@ -13,9 +13,7 @@
   $: linkedRows = linkedIds
   $: label = capitalise(schema.name)
   $: linkedTableId = schema.tableId
-  $: linkedTable = $tables.list.find(
-    table => table._id === linkedTableId
-  )
+  $: linkedTable = $tables.list.find(table => table._id === linkedTableId)
   $: fetchRows(linkedTableId)
 
   async function fetchRows(linkedTableId) {
diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
index 89d6ab143b..70e2306dcf 100644
--- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
@@ -7,7 +7,7 @@
     selectedAccessRole,
     screenSearchString,
   } from "builderStore"
-  import { roles } from 'stores/backend/'
+  import { roles } from "stores/backend"
   import { FrontendTypes } from "constants"
   import ComponentNavigationTree from "components/design/NavigationPanel/ComponentNavigationTree/index.svelte"
   import Layout from "components/design/NavigationPanel/Layout.svelte"
diff --git a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
index 2f94e9b9cc..6594f4d90c 100644
--- a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { store, allScreens } from "builderStore"
-  import { tables } from 'stores/backend/'
-  import { roles } from 'stores/backend/'
+  import { tables } from "stores/backend"
+  import { roles } from "stores/backend"
   import { Input, Select, ModalContent, Toggle } from "@budibase/bbui"
   import getTemplates from "builderStore/store/screenTemplates"
   import analytics from "analytics"
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
index 8fcd25cee3..7a4ab4c754 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
@@ -10,8 +10,11 @@
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { store, currentAsset } from "builderStore"
-  import { tables as tablesStore, queries as queriesStore } from 'stores/backend/'
-  import { datasources, integrations } from 'stores/backend/'
+  import {
+    tables as tablesStore,
+    queries as queriesStore,
+  } from "stores/backend"
+  import { datasources, integrations } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import ParameterBuilder from "components/integration/QueryParameterBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
@@ -83,9 +86,8 @@
   }
 
   function fetchQueryDefinition(query) {
-    const source = $datasources.list.find(
-      ds => ds._id === query.datasourceId
-    ).source
+    const source = $datasources.list.find(ds => ds._id === query.datasourceId)
+      .source
     return $integrations[source].query[query.queryVerb]
   }
 </script>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
index 9b6136ae1f..0895c78331 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
@@ -1,12 +1,13 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { store, currentAsset, backendUiStore } from "builderStore"
+  import { store, currentAsset } from "builderStore"
+  import { tables } from "stores/backend"
   import { getBindableProperties } from "builderStore/dataBinding"
   import DrawerBindableInput from "components/common/DrawerBindableInput.svelte"
 
   export let parameters
 
-  $: tableOptions = $backendUiStore.tables || []
+  $: tableOptions = $tables || []
   $: bindings = getBindableProperties($currentAsset, $store.selectedComponentId)
 </script>
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
index 59e16ace32..2bafed1408 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Spacer } from "@budibase/bbui"
   import { store, currentAsset } from "builderStore"
-  import { datasources, integrations, queries } from 'stores/backend/'
+  import { datasources, integrations, queries } from "stores/backend"
   import { getBindableProperties } from "builderStore/dataBinding"
   import ParameterBuilder from "components/integration/QueryParameterBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
@@ -25,14 +25,7 @@
   }
 </script>
 
-<<<<<<< HEAD
-<div class="root">
-  <Label small>Datasource</Label>
-  <Select thin secondary bind:value={parameters.datasourceId}>
-    <option value="" />
-    {#each $backendUiStore.datasources as datasource}
-      <option value={datasource._id}>{datasource.name}</option>
-=======
+
 <Label small>Datasource</Label>
 <Select thin secondary bind:value={parameters.datasourceId}>
   <option value="" />
@@ -49,7 +42,6 @@
     <option value="" />
     {#each $queries.list.filter(query => query.datasourceId === datasource._id) as query}
       <option value={query._id}>{query.name}</option>
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d
     {/each}
   </Select>
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
index b367b17484..a94a5e3002 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
@@ -1,6 +1,7 @@
 <script>
   import { Select, Label, Body } from "@budibase/bbui"
-  import { store, currentAsset, backendUiStore } from "builderStore"
+  import { store, currentAsset } from "builderStore"
+  import { tables } from "stores/backend"
   import {
     getDataProviderComponents,
     getSchemaForDatasource,
@@ -14,7 +15,7 @@
     $store.selectedComponentId
   )
   $: schemaFields = getSchemaFields(parameters?.tableId)
-  $: tableOptions = $backendUiStore.tables || []
+  $: tableOptions = $tables || []
 
   const getSchemaFields = tableId => {
     const { schema } = getSchemaForDatasource({ type: "table", tableId })
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
index 2fbe5820ae..13cdbac82f 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { roles } from 'stores/backend/'
+  import { roles } from "stores/backend"
 
   export let value
 </script>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte
index 75a0a740f8..b41098da2d 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { tables } from 'stores/backend/'
+  import { tables } from "stores/backend"
 
   export let value
 </script>
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 5d3472449c..ca931f26d7 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -15,7 +15,7 @@
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import ExternalDataSourceTable from "components/backend/DataTable/ExternalDataSourceTable.svelte"
   import ParameterBuilder from "components/integration/QueryParameterBuilder.svelte"
-  import { datasources, integrations, queries } from 'stores/backend/'
+  import { datasources, integrations, queries } from "stores/backend"
 
   const PREVIEW_HEADINGS = [
     {
@@ -39,9 +39,7 @@
   let parameters
   let data = []
 
-  $: datasource = $datasources.list.find(
-    ds => ds._id === query.datasourceId
-  )
+  $: datasource = $datasources.list.find(ds => ds._id === query.datasourceId)
 
   $: query.schema = fields.reduce(
     (acc, next) => ({
@@ -113,10 +111,7 @@
 
   async function saveQuery() {
     try {
-      const { _id } = await queries.save(
-        query.datasourceId,
-        query
-      )
+      const { _id } = await queries.save(query.datasourceId, query)
       notifier.success(`Query saved successfully.`)
       $goto(`../../${_id}`)
     } catch (err) {
diff --git a/packages/builder/src/components/settings/tabs/APIKeys.svelte b/packages/builder/src/components/settings/tabs/APIKeys.svelte
index e48af500dc..45dedf0041 100644
--- a/packages/builder/src/components/settings/tabs/APIKeys.svelte
+++ b/packages/builder/src/components/settings/tabs/APIKeys.svelte
@@ -2,7 +2,7 @@
   import { Input, Label, TextButton } from "@budibase/bbui"
   import api from "builderStore/api"
   import { notifier } from "builderStore/store/notifications"
-  import { database } from 'stores/backend/'
+  import { database } from "stores/backend"
   import analytics from "analytics"
 
   let keys = { budibase: "" }
diff --git a/packages/builder/src/pages/builder/[application]/_reset.svelte b/packages/builder/src/pages/builder/[application]/_reset.svelte
index 0336eac179..ffc46dacd4 100644
--- a/packages/builder/src/pages/builder/[application]/_reset.svelte
+++ b/packages/builder/src/pages/builder/[application]/_reset.svelte
@@ -1,6 +1,6 @@
 <script>
   import { store, automationStore } from "builderStore"
-  import { roles } from 'stores/backend/'
+  import { roles } from "stores/backend"
   import { Button } from "@budibase/bbui"
   import SettingsLink from "components/settings/Link.svelte"
   import ThemeEditorDropdown from "components/settings/ThemeEditorDropdown.svelte"
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
index 1195ef4b7a..4d6acc22ae 100644
--- a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
@@ -1,16 +1,9 @@
 <script>
-<<<<<<< HEAD:packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
   import { params } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { params } from "@sveltech/routify"
-  import { queries } from "stores/backend/"
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d:packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
+  import { queries } from "stores/backend"
 
   if ($params.query) {
-    const query = $queries.list.find(
-      m => m._id === $params.query
-    )
+    const query = $queries.list.find(m => m._id === $params.query)
     if (query) {
       queries.select(query)
     }
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
index 19aa8ba2ec..554e9fba35 100644
--- a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
@@ -1,11 +1,6 @@
 <script>
-<<<<<<< HEAD:packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
   import { params } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { params } from "@sveltech/routify"
-  import { database, queries } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d:packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
+  import { database, queries } from "stores/backend"
   import QueryInterface from "components/integration/QueryViewer.svelte"
 
   async function fetchQueryConfig() {
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte
index 6549b10439..13f8719594 100644
--- a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte
@@ -1,11 +1,6 @@
 <script>
-<<<<<<< HEAD:packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte
   import { params } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { params } from "@sveltech/routify"
-  import { datasources } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d:packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/_layout.svelte
+  import { datasources } from "stores/backend"
 
   if ($params.selectedDatasource) {
     const datasource = $datasources.list.find(
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
index 5c9a45f867..76bab80067 100644
--- a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -1,16 +1,14 @@
 <script>
   import { goto, beforeUrlChange } from "@roxi/routify"
   import { Button, Heading, Body, Spacer } from "@budibase/bbui"
-  import { datasources, integrations, queries } from 'stores/backend/'
+  import { datasources, integrations, queries } from "stores/backend"
   import { notifier } from "builderStore/store/notifications"
   import IntegrationConfigForm from "components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte"
   import ICONS from "components/backend/DatasourceNavigator/icons"
 
   let unsaved = false
 
-  $: datasource = $datasources.list.find(
-    ds => ds._id === $datasources.selected
-  )
+  $: datasource = $datasources.list.find(ds => ds._id === $datasources.selected)
   $: integration = datasource && $integrations[datasource.source]
 
   async function saveDatasource() {
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/_layout.svelte
index e2433862c0..d05aa882ad 100644
--- a/packages/builder/src/pages/builder/[application]/data/datasource/_layout.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/datasource/_layout.svelte
@@ -1,15 +1,11 @@
 <script>
-  import { datasources } from 'stores/backend/'
-  import { goto, leftover } from "@sveltech/routify"
+  import { datasources } from "stores/backend"
+  import { goto, leftover } from "@roxi/routify"
   import { onMount } from "svelte"
 
   onMount(async () => {
     // navigate to first datasource in list, if not already selected
-    if (
-      !$leftover &&
-      $datasources.list.length > 0 &&
-      !$datasources.selected
-    ) {
+    if (!$leftover && $datasources.list.length > 0 && !$datasources.selected) {
       $goto(`./${$datasources.list[0]._id}`)
     }
   })
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte
index ef8d75db94..fb14c6d0a1 100644
--- a/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte
@@ -1,17 +1,15 @@
 <script>
-<<<<<<< HEAD:packages/builder/src/pages/builder/[application]/data/datasource/index.svelte
-  import { backendUiStore } from "builderStore"
+  import { datasources, tables } from "stores/backend"
   import { goto } from "@roxi/routify"
   import { onMount } from "svelte"
 
   onMount(async () => {
     // navigate to first table in list, if not already selected
-    $backendUiStore.datasources.length > 0 &&
-      $goto(`./${$backendUiStore.datasources[0]._id}`)
+    $datasources.list.length > 0 && $goto(`../${$datasources.list[0]._id}`)
   })
 </script>
 
-{#if $backendUiStore.tables.length === 0}
+{#if $tables.list.length === 0}
   <i>Connect your first datasource to start building.</i>
 {:else}<i>Select a datasource to edit</i>{/if}
 
@@ -22,26 +20,3 @@
     margin-top: 2px;
   }
 </style>
-=======
-    import { datasources, tables } from 'stores/backend/'
-    import { goto } from "@sveltech/routify"
-    import { onMount } from "svelte"
-
-    onMount(async () => {
-      // navigate to first table in list, if not already selected
-      $datasources.list.length > 0 && $goto(`../${$datasources.list[0]._id}`)
-    })
-  </script>
-  
-  {#if $tables.list.length === 0}
-    <i>Connect your first datasource to start building.</i>
-  {:else}<i>Select a datasource to edit</i>{/if}
-  
-  <style>
-    i {
-      font-size: var(--font-size-m);
-      color: var(--grey-5);
-      margin-top: 2px;
-    }
-  </style>
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d:packages/builder/src/pages/[application]/data/datasource/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte
index ad2c1e407b..14f6303e5f 100644
--- a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte
@@ -1,16 +1,9 @@
 <script>
-<<<<<<< HEAD:packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte
   import { params } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { params } from "@sveltech/routify"
-  import { tables } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d:packages/builder/src/pages/[application]/data/table/[selectedTable]/_layout.svelte
+  import { tables } from "stores/backend"
 
   if ($params.selectedTable) {
-    const table = $tables.list.find(
-      m => m._id === $params.selectedTable
-    )
+    const table = $tables.list.find(m => m._id === $params.selectedTable)
     if (table) {
       tables.select(table)
     }
diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte b/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte
index 5641c8af11..a68c0dc651 100644
--- a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import TableDataTable from "components/backend/DataTable/DataTable.svelte"
-  import { tables, database } from 'stores/backend/'
+  import { tables, database } from "stores/backend"
 </script>
 
 {#if $database?._id && $tables?.selected?.name}
diff --git a/packages/builder/src/pages/builder/[application]/data/table/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/table/_layout.svelte
index 1a542d9ad8..9ab874a4d0 100644
--- a/packages/builder/src/pages/builder/[application]/data/table/_layout.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/table/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { tables } from 'stores/backend/'
-  import { goto, leftover } from "@sveltech/routify"
+  import { tables } from "stores/backend"
+  import { goto, leftover } from "@roxi/routify"
   import { onMount } from "svelte"
 
   onMount(async () => {
diff --git a/packages/builder/src/pages/builder/[application]/data/table/index.svelte b/packages/builder/src/pages/builder/[application]/data/table/index.svelte
index 5e71cc32e9..5fbdaa030f 100644
--- a/packages/builder/src/pages/builder/[application]/data/table/index.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/table/index.svelte
@@ -1,20 +1,10 @@
 <script>
-<<<<<<< HEAD:packages/builder/src/pages/builder/[application]/data/table/index.svelte
-  import { backendUiStore } from "builderStore"
   import { goto } from "@roxi/routify"
   import { onMount } from "svelte"
-
-  onMount(async () => {
-    $backendUiStore.tables.length > 0 &&
-      $goto(`./${$backendUiStore.tables[0]._id}`)
-=======
-  import { tables } from 'stores/backend/'
-  import { goto } from "@sveltech/routify"
-  import { onMount } from "svelte"
+  import { tables } from "stores/backend"
 
   onMount(async () => {
     $tables.list.length > 0 && $goto(`../${$tables.list[0]._id}`)
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d:packages/builder/src/pages/[application]/data/table/index.svelte
   })
 </script>
 
diff --git a/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte b/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte
index 87251c5da1..ec8bca74ef 100644
--- a/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte
@@ -1,11 +1,6 @@
 <script>
-<<<<<<< HEAD:packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte
   import { params } from "@roxi/routify"
-  import { backendUiStore } from "builderStore"
-=======
-  import { params } from "@sveltech/routify"
-  import { tables, views } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d:packages/builder/src/pages/[application]/data/view/[selectedView]/_layout.svelte
+  import { tables, views } from "stores/backend"
 
   if ($params.selectedView) {
     let view
diff --git a/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte b/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte
index 9b06351344..2d02b6bcda 100644
--- a/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte
@@ -1,11 +1,6 @@
 <script>
-<<<<<<< HEAD:packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte
   import ViewDataTable from "components/backend/DataTable/ViewDataTable.svelte"
-  import { backendUiStore } from "builderStore"
-=======
-  import ViewDataTable from "components/backend/DataTable/ViewDataTable"
-  import { views, database } from 'stores/backend/'
->>>>>>> d803aa0bd7a74220e432f4a1b338abdd7fbe9b7d:packages/builder/src/pages/[application]/data/view/[selectedView]/index.svelte
+  import { views, database } from "stores/backend"
 
   $: selectedView = $views.selected
 </script>
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index b7ca281a63..db02790ffd 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -40,6 +40,10 @@ export default ({ mode }) => {
           find: "builderStore",
           replacement: path.resolve("./src/builderStore"),
         },
+        {
+          find: "stores",
+          replacement: path.resolve("./src/stores"),
+        },
         {
           find: "constants",
           replacement: path.resolve("./src/constants"),