diff --git a/packages/server/package.json b/packages/server/package.json
index d42895d08e..847a03ba07 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.40-alpha.0",
     "@budibase/client": "2.0.40-alpha.0",
-    "@budibase/pro": "2.0.39",
+    "@budibase/pro": "2.0.40-alpha.0",
     "@budibase/string-templates": "2.0.40-alpha.0",
     "@budibase/types": "2.0.40-alpha.0",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 3a5ecb3f36..3b76c97d10 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,21 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-<<<<<<< HEAD
-"@budibase/backend-core@2.0.34-alpha.10":
-  version "2.0.34-alpha.10"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.10.tgz#ee3e3f0b76001e15ecb26a9ed54afba779dbc190"
-  integrity sha512-cXTZ5q6s5eacfdMtZ/XABTLnVjj6dvbmeSM07wzDTvlIvYzUH5FpU/Vk1atZybeyank/7ttAzGI7LTs6Kz1e3g==
+"@budibase/backend-core@2.0.40-alpha.0":
+  version "2.0.40-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.0.tgz#197df7756b8352bbda189e0f497b8df64a4a09de"
+  integrity sha512-7HjMzpSMDcxgJwUrWvibK0Koj348JyAkMhtSjGxj7s8lhu+z9GcqiWNHssx5sdramShmbSkcNny5vnM+A9w+tQ==
   dependencies:
-    "@budibase/types" "2.0.34-alpha.10"
-=======
-"@budibase/backend-core@2.0.39":
-  version "2.0.39"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.39.tgz#7b09d664763fe11177160e3f3f868163851ca100"
-  integrity sha512-vtWJXyxq+GsLiPF0le9yCTvd9kFRlyUXOpMZqwdM8f5M095lU3ZqK4PYScrtRaOSeQ9LO0u5yrSdG9pFZ5vPCw==
-  dependencies:
-    "@budibase/types" "^2.0.39"
->>>>>>> 51d5c60b955f6de5805545ee295b834f2fa8b657
+    "@budibase/types" "2.0.40-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1190,23 +1181,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-<<<<<<< HEAD
-"@budibase/pro@2.0.34-alpha.10":
-  version "2.0.34-alpha.10"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.10.tgz#0ec55bd5b34c495dcb35853972e7a4e66967c8e1"
-  integrity sha512-R1esoxSwYRlEtM3C5uobBP4l0yc4uM1h+kfonsrHXr9/HvQkOyu76JURZFHSEkdHUFqerAZ7a1AE6Z7xCTamQw==
+"@budibase/pro@2.0.40-alpha.0":
+  version "2.0.40-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.0.tgz#748fdad163159cc04b5b2b3103179c9e3bb22ab1"
+  integrity sha512-brBVT2B/nzZw8iYnC6Xhu0+x3JprgEsN1s40tQaYbVAvXB6GuHCtnkJ6mDoGDB5xQTilNdx+xNfF/qpZQv7h9w==
   dependencies:
-    "@budibase/backend-core" "2.0.34-alpha.10"
-    "@budibase/types" "2.0.34-alpha.10"
-=======
-"@budibase/pro@2.0.39":
-  version "2.0.39"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.39.tgz#0830b531d2b3751fbda70320889991bff8495b64"
-  integrity sha512-mNowoCtot6OOntc+XgSUR9G0cILxIBWzyKmXSxa1IwnlLThCK3ZtOjc9m2BpxRRs8SOkAyPWyBezuWi82x0tEw==
-  dependencies:
-    "@budibase/backend-core" "2.0.39"
-    "@budibase/types" "2.0.39"
->>>>>>> 51d5c60b955f6de5805545ee295b834f2fa8b657
+    "@budibase/backend-core" "2.0.40-alpha.0"
+    "@budibase/types" "2.0.40-alpha.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1230,17 +1211,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-<<<<<<< HEAD
-"@budibase/types@2.0.34-alpha.10":
-  version "2.0.34-alpha.10"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.10.tgz#6a16d4fd97136de58acbe62319b03c7144a6fb44"
-  integrity sha512-zD1dZ/KGw9xbTL0AntenEkLxYIhtKiL72qgDLKQTA9kLjme1ePECealqmmQjPsf3Zj694MNN6PjSJ00C51CVNg==
-=======
-"@budibase/types@2.0.39", "@budibase/types@^2.0.39":
-  version "2.0.39"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.39.tgz#dd6580367e08175fbe18152ac7bf0a59937eab79"
-  integrity sha512-FTp4If33Q8a112jTtPjjVQwZj9xLe15781mjgBKQI76+lNLxeRVMIe7QU/Pq3qPc4uJl8MpNlY2ZXhd9XA5y4g==
->>>>>>> 51d5c60b955f6de5805545ee295b834f2fa8b657
+"@budibase/types@2.0.40-alpha.0":
+  version "2.0.40-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.0.tgz#22664329f7662cbf6fc4755f08fb1e6eed65f8c7"
+  integrity sha512-Z/PZrzkiK4MfsngSzyYmCnYHcGmTQci6achej3q2qPtnG7+AZpmTDszovznMytfyNA+TMvFesECzBy1p+KBTDQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 223a2acd9a..ede5aa8786 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.40-alpha.0",
-    "@budibase/pro": "2.0.39",
+    "@budibase/pro": "2.0.40-alpha.0",
     "@budibase/string-templates": "2.0.40-alpha.0",
     "@budibase/types": "2.0.40-alpha.0",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 775a4b5e53..932ad82946 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.39":
-  version "2.0.39"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.39.tgz#7b09d664763fe11177160e3f3f868163851ca100"
-  integrity sha512-vtWJXyxq+GsLiPF0le9yCTvd9kFRlyUXOpMZqwdM8f5M095lU3ZqK4PYScrtRaOSeQ9LO0u5yrSdG9pFZ5vPCw==
+"@budibase/backend-core@2.0.40-alpha.0":
+  version "2.0.40-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.0.tgz#197df7756b8352bbda189e0f497b8df64a4a09de"
+  integrity sha512-7HjMzpSMDcxgJwUrWvibK0Koj348JyAkMhtSjGxj7s8lhu+z9GcqiWNHssx5sdramShmbSkcNny5vnM+A9w+tQ==
   dependencies:
-    "@budibase/types" "^2.0.39"
+    "@budibase/types" "2.0.40-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -328,22 +328,22 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.39":
-  version "2.0.39"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.39.tgz#0830b531d2b3751fbda70320889991bff8495b64"
-  integrity sha512-mNowoCtot6OOntc+XgSUR9G0cILxIBWzyKmXSxa1IwnlLThCK3ZtOjc9m2BpxRRs8SOkAyPWyBezuWi82x0tEw==
+"@budibase/pro@2.0.40-alpha.0":
+  version "2.0.40-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.0.tgz#748fdad163159cc04b5b2b3103179c9e3bb22ab1"
+  integrity sha512-brBVT2B/nzZw8iYnC6Xhu0+x3JprgEsN1s40tQaYbVAvXB6GuHCtnkJ6mDoGDB5xQTilNdx+xNfF/qpZQv7h9w==
   dependencies:
-    "@budibase/backend-core" "2.0.39"
-    "@budibase/types" "2.0.39"
+    "@budibase/backend-core" "2.0.40-alpha.0"
+    "@budibase/types" "2.0.40-alpha.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.39", "@budibase/types@^2.0.39":
-  version "2.0.39"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.39.tgz#dd6580367e08175fbe18152ac7bf0a59937eab79"
-  integrity sha512-FTp4If33Q8a112jTtPjjVQwZj9xLe15781mjgBKQI76+lNLxeRVMIe7QU/Pq3qPc4uJl8MpNlY2ZXhd9XA5y4g==
+"@budibase/types@2.0.40-alpha.0":
+  version "2.0.40-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.0.tgz#22664329f7662cbf6fc4755f08fb1e6eed65f8c7"
+  integrity sha512-Z/PZrzkiK4MfsngSzyYmCnYHcGmTQci6achej3q2qPtnG7+AZpmTDszovznMytfyNA+TMvFesECzBy1p+KBTDQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"