diff --git a/package-lock.json b/package-lock.json
index c797553..abe2b4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9312,13 +9312,10 @@
     },
     "node_modules/braces": {
       "version": "3.0.3",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-=======
       "devOptional": true,
       "license": "MIT",
->>>>>>> dev
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -12280,13 +12277,10 @@
     },
     "node_modules/fill-range": {
       "version": "7.1.1",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-=======
       "devOptional": true,
       "license": "MIT",
->>>>>>> dev
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },