chore(merge): main to staging

packages/backend/package.json

@@ -1,6 +1,10 @@
 {
     "name": "@p0tion/backend",
+<<<<<<< HEAD
     "version": "1.0.8",
+=======
+    "version": "1.0.7",
+>>>>>>> 110e869 ([release/v1.0.7] Promote dev to staging (#176))
     "description": "MPC Phase 2 backend for Firebase services management",
     "repository": "[email protected]:privacy-scaling-explorations/p0tion.git",
     "homepage": "https://github.com/privacy-scaling-explorations/p0tion",
@@ -67,7 +71,11 @@
         "@aws-sdk/client-ssm": "^3.357.0",
         "@aws-sdk/middleware-endpoint": "^3.329.0",
         "@aws-sdk/s3-request-presigner": "^3.329.0",
+<<<<<<< HEAD
         "@p0tion/actions": "^1.0.8",
+=======
+        "@p0tion/actions": "^1.0.7",
+>>>>>>> 110e869 ([release/v1.0.7] Promote dev to staging (#176))
         "blakejs": "^1.2.1",
         "dotenv": "^16.0.3",
         "ethers": "5.7.2",

packages/phase2cli/package.json

@@ -1,7 +1,11 @@
 {
     "name": "@p0tion/phase2cli",
     "type": "module",
+<<<<<<< HEAD
     "version": "1.0.8",
+=======
+    "version": "1.0.7",
+>>>>>>> 110e869 ([release/v1.0.7] Promote dev to staging (#176))
     "description": "All-in-one interactive command-line for interfacing with zkSNARK Phase 2 Trusted Setup ceremonies",
     "repository": "[email protected]:privacy-scaling-explorations/p0tion.git",
     "homepage": "https://github.com/privacy-scaling-explorations/p0tion",
@@ -68,7 +72,11 @@
         "@octokit/auth-oauth-app": "^5.0.5",
         "@octokit/auth-oauth-device": "^4.0.4",
         "@octokit/request": "^6.2.3",
+<<<<<<< HEAD
         "@p0tion/actions": "^1.0.8",
+=======
+        "@p0tion/actions": "^1.0.7",
+>>>>>>> 110e869 ([release/v1.0.7] Promote dev to staging (#176))
         "blakejs": "^1.2.1",
         "boxen": "^7.1.0",
         "chalk": "^5.2.0",