diff --git a/package-lock.json b/package-lock.json
index 2c9a2bf..cdef6b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2537,6 +2537,27 @@
         "node": ">=6.0.0"
       }
     },
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> ef74d9b (Bump ts-jest from 29.1.2 to 29.2.5)
+    "node_modules/dot-object": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/dot-object/-/dot-object-2.1.5.tgz",
+      "integrity": "sha512-xHF8EP4XH/Ba9fvAF2LDd5O3IITVolerVV6xvkxoM8zlGEiCUrggpAnHyOoKJKCrhvPcGATFAUwIujj7bRG5UA==",
+      "license": "MIT",
+      "dependencies": {
+        "commander": "^6.1.0",
+        "glob": "^7.1.6"
+      },
+      "bin": {
+        "dot-object": "bin/dot-object"
+      }
+    },
+>>>>>>> eb33ba8 (Bump ts-jest from 29.1.2 to 29.2.5)
     "node_modules/ejs": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
@@ -2553,6 +2574,15 @@
         "node": ">=0.10.0"
       }
     },
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> b8ebb8b (upgrade @action/cache from 4.0.0 to 4.0.2 (#766))
+=======
+>>>>>>> bc32431 (Bump ts-jest from 29.1.2 to 29.2.5)
+>>>>>>> ef74d9b (Bump ts-jest from 29.1.2 to 29.2.5)
+>>>>>>> eb33ba8 (Bump ts-jest from 29.1.2 to 29.2.5)
     "node_modules/electron-to-chromium": {
       "version": "1.4.589",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.589.tgz",