diff --git a/package-lock.json b/package-lock.json
index 396e8a7..98f208d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1972,7 +1972,10 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+<<<<<<< HEAD
       "license": "MIT",
+=======
+>>>>>>> f64733aeed11a7f0f498a61b402fcb2195ffadde
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -2731,7 +2734,10 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+<<<<<<< HEAD
       "license": "MIT",
+=======
+>>>>>>> f64733aeed11a7f0f498a61b402fcb2195ffadde
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },