diff --git a/package-lock.json b/package-lock.json
index b18a6e5d2..d2acb56bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7153,6 +7153,7 @@
       }
     },
     "live-plugin-manager-git-fix": {
+<<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
 <<<<<<< refs/remotes/origin/bug_fix/solc-loading-issue
       "version": "0.12.1",
       "resolved": "https://registry.npmjs.org/live-plugin-manager-git-fix/-/live-plugin-manager-git-fix-0.12.1.tgz",
@@ -7162,6 +7163,11 @@
       "resolved": "https://registry.npmjs.org/live-plugin-manager-git-fix/-/live-plugin-manager-git-fix-0.12.0.tgz",
       "integrity": "sha512-2T5XLjlzPfbvAO1d4U2QvcG/YEewWTqG4GEX5GNQB3rEuHQ/YA3ChwylBbEIC/7Ase4h0vpRER60PJHgjn8/3A==",
 >>>>>>> point to a forked npm package (for now), to avoid the npm install issues some users are reporting
+=======
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/live-plugin-manager-git-fix/-/live-plugin-manager-git-fix-0.12.1.tgz",
+      "integrity": "sha512-1FvmI3xP246iNgwMcdqlAdPfGhugwiKQhQwg8YY8Uzbzra47lXVpgk3Fe/YDVBRpnnBTQ2YKdDlq4WM86G41SA==",
+>>>>>>> update references to package
       "requires": {
         "@types/debug": "0.0.30",
         "@types/fs-extra": "5.0.3",