diff --git a/package-lock.json b/package-lock.json
index 9f09562..70bf463 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2568,9 +2568,15 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
+<<<<<<< HEAD
       "version": "1.14.9",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
       "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+=======
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+>>>>>>> eaa3909dfc4448bc3d982e5e7c3a045f7297941c
       "dev": true,
       "funding": [
         {
@@ -5652,9 +5658,15 @@
       }
     },
     "node_modules/vm2": {
+<<<<<<< HEAD
       "version": "3.9.8",
       "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz",
       "integrity": "sha512-/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w==",
+=======
+      "version": "3.9.7",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.7.tgz",
+      "integrity": "sha512-g/GZ7V0Mlmch3eDVOATvAXr1GsJNg6kQ5PjvYy3HbJMCRn5slNbo/u73Uy7r5yUej1cRa3ZjtoVwcWSQuQ/fow==",
+>>>>>>> eaa3909dfc4448bc3d982e5e7c3a045f7297941c
       "dev": true,
       "dependencies": {
         "acorn": "^8.7.0",
@@ -7876,9 +7888,15 @@
       "dev": true
     },
     "follow-redirects": {
+<<<<<<< HEAD
       "version": "1.14.9",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
       "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+=======
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+>>>>>>> eaa3909dfc4448bc3d982e5e7c3a045f7297941c
       "dev": true
     },
     "form-data": {
@@ -10118,9 +10136,15 @@
       }
     },
     "vm2": {
+<<<<<<< HEAD
       "version": "3.9.8",
       "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz",
       "integrity": "sha512-/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w==",
+=======
+      "version": "3.9.7",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.7.tgz",
+      "integrity": "sha512-g/GZ7V0Mlmch3eDVOATvAXr1GsJNg6kQ5PjvYy3HbJMCRn5slNbo/u73Uy7r5yUej1cRa3ZjtoVwcWSQuQ/fow==",
+>>>>>>> eaa3909dfc4448bc3d982e5e7c3a045f7297941c
       "dev": true,
       "requires": {
         "acorn": "^8.7.0",