diff --git a/package-lock.json b/package-lock.json
index be5899f3..51184f15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27956,11 +27956,7 @@
     },
     "flv.js": {
       "version": "1.6.2",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
-=======
       "resolved": "https://registry.npmjs.org/flv.js/-/flv.js-1.6.2.tgz",
->>>>>>> 32846230ee3a311bde67fa2c33075b4a2cda57ce
       "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
       "requires": {
         "es6-promise": "^4.2.8",