update after rebase

Author: GuillaumeRx

packages/examples/packages/browserify-plugin/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "M83EcfIuVLDGdfzDz6ydToeMztnTSLhjTHpkiGwi3Mo=",
+    "shasum": "rwdRZcZOgYfoAvunjlh3qgfhusfBqSv3g23SNhrfSQc=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/examples/packages/browserify/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "AEZW5peO3bzO6yrbWCplB1yo/tyNirb6bAUXwSuspBc=",
+    "shasum": "12YFI4tP/C551Biu4npoh6PtlIPLKDcZa6Mrx2ZItlc=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/snaps-controllers/package.json

@@ -83,12 +83,8 @@
     "@metamask/base-controller": "^8.0.0",
     "@metamask/json-rpc-engine": "^10.0.2",
     "@metamask/json-rpc-middleware-stream": "^8.0.7",
-<<<<<<< HEAD
     "@metamask/key-tree": "^10.1.0",
-=======
-    "@metamask/key-tree": "^10.0.2",
     "@metamask/keyring-internal-api": "^6.0.0",
->>>>>>> 1e98fa8c (add account handling)
     "@metamask/object-multiplex": "^2.1.0",
     "@metamask/permission-controller": "^11.0.6",
     "@metamask/phishing-controller": "^12.4.0",

yarn.lock

@@ -6254,19 +6254,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 "@noble/curves@npm:1.4.2, @noble/curves@npm:~1.4.0":
-=======
-<<<<<<< HEAD
-"@noble/curves@npm:1.4.2, @noble/curves@npm:^1.1.0, @noble/curves@npm:^1.2.0, @noble/curves@npm:~1.4.0":
-=======
-"@noble/curves@npm:1.4.2, @noble/curves@npm:~1.4.0":
->>>>>>> 97d29693 (add account handling)
->>>>>>> 1e98fa8c (add account handling)
-=======
-"@noble/curves@npm:1.4.2, @noble/curves@npm:^1.1.0, @noble/curves@npm:^1.2.0, @noble/curves@npm:~1.4.0":
->>>>>>> c47feb14 (refactor to only support non-EIP155 values)
   version: 1.4.2
   resolution: "@noble/curves@npm:1.4.2"
   dependencies: