diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ace41ddfae7..6a8a7be68e9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2715,10 +2715,10 @@ importers:
         version: 29.7.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.1.5(jest@29.7.0)(typescript@5.4.5)
+        version: 29.1.5(jest@29.7.0)(typescript@5.6.3)
       typescript:
         specifier: ^5.4.5
-        version: 5.4.5
+        version: 5.6.3
 
   libs/coin-modules/coin-near:
     dependencies:
@@ -35895,23 +35895,6 @@ snapshots:
       find-yarn-workspace-root: 2.0.0
       js-yaml: 3.14.1
       micromatch: 4.0.7
-<<<<<<< HEAD
-=======
-      npm-package-arg: 7.0.0
-      split: 1.0.1
-      sudo-prompt: 9.1.1
-
-  '@expo/package-manager@1.4.2':
-    dependencies:
-      '@expo/json-file': 8.3.0
-      '@expo/spawn-async': 1.7.2
-      ansi-regex: 5.0.1
-      chalk: 4.1.2
-      find-up: 5.0.0
-      find-yarn-workspace-root: 2.0.0
-      js-yaml: 3.14.1
-      micromatch: 4.0.7
->>>>>>> 46043b068e (wip)
       npm-package-arg: 7.0.0
       ora: 3.4.0
       split: 1.0.1
@@ -37025,7 +37008,6 @@ snapshots:
       jest-validate: 29.7.0
       jest-watcher: 29.7.0
       micromatch: 4.0.7
-<<<<<<< HEAD
       pretty-format: 29.7.0
       slash: 3.0.0
       strip-ansi: 6.0.1
@@ -37062,8 +37044,6 @@ snapshots:
       jest-validate: 29.7.0
       jest-watcher: 29.7.0
       micromatch: 4.0.7
-=======
->>>>>>> 46043b068e (wip)
       pretty-format: 29.7.0
       slash: 3.0.0
       strip-ansi: 6.0.1
@@ -54908,11 +54888,7 @@ snapshots:
       graceful-fs: 4.2.11
       jest-regex-util: 29.6.3
       jest-util: 29.7.0
-<<<<<<< HEAD
       jest-worker: 29.7.0(metro@0.80.12)
-=======
-      jest-worker: 29.7.0(metro@0.80.8)
->>>>>>> 46043b068e (wip)
       micromatch: 4.0.7
       walker: 1.0.8
     optionalDependencies:
@@ -57277,11 +57253,7 @@ snapshots:
       flow-enums-runtime: 0.0.6
       graceful-fs: 4.2.11
       invariant: 2.2.4
-<<<<<<< HEAD
       jest-worker: 29.7.0(metro@0.80.12)
-=======
-      jest-worker: 29.7.0(metro@0.80.8)
->>>>>>> 46043b068e (wip)
       micromatch: 4.0.7
       node-abort-controller: 3.1.1
       nullthrows: 1.1.1
@@ -63871,31 +63843,12 @@ snapshots:
       typescript: 5.4.3
       yargs-parser: 21.1.1
 
-  ts-jest@29.1.5(jest@29.7.0)(typescript@5.4.5):
-    dependencies:
-      bs-logger: 0.2.6
-      fast-json-stable-stringify: 2.1.0
-      jest: 29.7.0
-      jest-util: 29.7.0
-      json5: 2.2.3
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.6.3
-      typescript: 5.4.5
-      yargs-parser: 21.1.1
-
   ts-loader@9.5.1(typescript@5.1.3)(webpack@5.94.0):
     dependencies:
       chalk: 4.1.2
-<<<<<<< HEAD
       enhanced-resolve: 5.17.1
       micromatch: 4.0.7
-      semver: 7.5.4
-=======
-      enhanced-resolve: 5.16.0
-      micromatch: 4.0.7
       semver: 7.6.3
->>>>>>> 46043b068e (wip)
       source-map: 0.7.4
       typescript: 5.1.3
       webpack: 5.94.0