diff --git a/packages/builder/src/components/beta/BetaTab.svelte b/packages/builder/src/components/beta/BetaTab.svelte
new file mode 100644
index 0000000000..e8c484eba1
--- /dev/null
+++ b/packages/builder/src/components/beta/BetaTab.svelte
@@ -0,0 +1,26 @@
+<script>
+  import { Body, Button, Layout, Heading } from "@budibase/bbui"
+  import { CookieUtils } from "@budibase/frontend-core"
+
+  function openFeedbackApp() {
+    window.open(`https://bb.budibase.app/betauifeedback`)
+  }
+
+  function revertToOldBuilder() {
+    CookieUtils.removeCookie("beta:new_design_ui")
+    window.location.reload()
+  }
+</script>
+
+<Layout>
+  <Heading size="M">Beta Builder</Heading>
+  <Body>
+    Your account has been given access to the budibase beta program. We would
+    love to hear what you think and get your feedback and suggestions on the new
+    Design UI.
+  </Body>
+  <Button cta on:click={openFeedbackApp}>Give Feedback</Button>
+  <Button secondary on:click={revertToOldBuilder}
+    >Revert back to old builder</Button
+  >
+</Layout>
diff --git a/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte
new file mode 100644
index 0000000000..8d61c96488
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/beta/_layout.svelte
@@ -0,0 +1,8 @@
+<script>
+  import { Layout } from "@budibase/bbui"
+</script>
+
+<!-- routify:options index=5 -->
+<Layout gap="S" justifyItems="center">
+  <slot />
+</Layout>
diff --git a/packages/builder/src/pages/builder/app/[application]/beta/index.svelte b/packages/builder/src/pages/builder/app/[application]/beta/index.svelte
new file mode 100644
index 0000000000..79125ea2c2
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/beta/index.svelte
@@ -0,0 +1,5 @@
+<script>
+  import BetaTab from "components/beta/BetaTab.svelte"
+</script>
+
+<BetaTab />
diff --git a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte
index 807110e03e..d4a5cb745a 100644
--- a/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[application]/index.svelte
@@ -27,6 +27,7 @@
   import AppLockModal from "components/common/AppLockModal.svelte"
   import EditableIcon from "components/common/EditableIcon.svelte"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import BetaTab from "components/beta/BetaTab.svelte"
   import { checkIncomingDeploymentStatus } from "components/deploy/utils"
   import { onDestroy, onMount } from "svelte"
 
@@ -318,6 +319,9 @@
           <Tab title="Settings">
             <SettingsTab app={selectedApp} />
           </Tab>
+          <Tab title="Beta">
+            <BetaTab />
+          </Tab>
         </Tabs>
       </div>
       <ConfirmDialog
diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte
index 32ff8cc748..b9113f9532 100644
--- a/packages/client/src/components/preview/IndicatorSet.svelte
+++ b/packages/client/src/components/preview/IndicatorSet.svelte
@@ -2,7 +2,7 @@
   import { onMount, onDestroy } from "svelte"
   import Indicator from "./Indicator.svelte"
   import { domDebounce } from "utils/domDebounce"
-  import { builderStore, componentStore } from "stores"
+  import { builderStore } from "stores"
 
   export let componentId
   export let color
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4cd78dabab..05a408ebd4 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1092,21 +1092,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-<<<<<<< HEAD
 "@budibase/pro@1.0.178-alpha.0":
   version "1.0.178-alpha.0"
   resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178-alpha.0.tgz#40a137cdde7f467034d0684882b97e3e4e34a706"
   integrity sha512-q2XboAmumM2eczhbye/dLcnqkrk9cqXlcGP4IjpNvaNfgFx3Q0pYncr18J5DmmcFoPF+J1zZux5M48dLZxfOCg==
   dependencies:
     "@budibase/backend-core" "1.0.178-alpha.0"
-=======
-"@budibase/pro@^1.0.175":
-  version "1.0.175"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.175.tgz#1d8ddc698ad17e2f5d73b1ab741c6641da4bda47"
-  integrity sha512-iGqOtsXeO5bHcg4IJjg8NwOK5bNjI3TnJCr7PtcTjlLyZyCyj+onL2GTk3A6X+d1ZKSQKy9bl3Q+hIsdbZ9GIg==
-  dependencies:
-    "@budibase/backend-core" "1.0.175"
->>>>>>> eaf3eea73d7d2927f5b87f5fede628947362297a
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 39f2be96e2..619a4f2808 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -322,21 +322,12 @@
     uuid "^8.3.2"
     zlib "^1.0.5"
 
-<<<<<<< HEAD
 "@budibase/pro@1.0.178-alpha.0":
   version "1.0.178-alpha.0"
   resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178-alpha.0.tgz#40a137cdde7f467034d0684882b97e3e4e34a706"
   integrity sha512-q2XboAmumM2eczhbye/dLcnqkrk9cqXlcGP4IjpNvaNfgFx3Q0pYncr18J5DmmcFoPF+J1zZux5M48dLZxfOCg==
   dependencies:
     "@budibase/backend-core" "1.0.178-alpha.0"
-=======
-"@budibase/pro@^1.0.175":
-  version "1.0.175"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.175.tgz#1d8ddc698ad17e2f5d73b1ab741c6641da4bda47"
-  integrity sha512-iGqOtsXeO5bHcg4IJjg8NwOK5bNjI3TnJCr7PtcTjlLyZyCyj+onL2GTk3A6X+d1ZKSQKy9bl3Q+hIsdbZ9GIg==
-  dependencies:
-    "@budibase/backend-core" "1.0.175"
->>>>>>> eaf3eea73d7d2927f5b87f5fede628947362297a
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":
