diff --git a/package-lock.json b/package-lock.json
index ec0278e..e8ee07a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14797,11 +14797,7 @@
       "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
       "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
       "requires": {
-<<<<<<< HEAD
         "random-bytes": "1.0.0"
-=======
-        "random-bytes": "~1.0.0"
->>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc
       }
     },
     "uid2": {