diff --git a/package-lock.json b/package-lock.json
index 90a4bde6e6..49d6fabc80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54075,7 +54075,6 @@
       "integrity": "sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA=="
     },
     "@remixproject/engine": {
-<<<<<<< HEAD
       "version": "0.3.20-alpha.2",
       "resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.20-alpha.2.tgz",
       "integrity": "sha512-fHHuh5uH99hRYDD3slpaeu36XXGyIau1Ewf6yQp0UrmUDXeuDjJI2XaOUxlxGp4rN55045TD4D8ojYAG0PTLOQ==",
@@ -54101,33 +54100,6 @@
       "requires": {
         "@remixproject/plugin-api": "0.3.20-alpha.2",
         "@remixproject/plugin-utils": "0.3.20-alpha.2",
-=======
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.19.tgz",
-      "integrity": "sha512-ZUF/KJp/4sULJXKGqRN5e033RGpzI6zknaWR6jEK5cBJi4aoveOpfKvKUBUhUgb3ugYKQoe3d+EGjYPvafjucQ==",
-      "requires": {
-        "@remixproject/plugin-api": "0.3.19",
-        "@remixproject/plugin-utils": "0.3.19"
-      }
-    },
-    "@remixproject/engine-web": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@remixproject/engine-web/-/engine-web-0.3.19.tgz",
-      "integrity": "sha512-1wJNwnNYuW7PzcnOHxXd+3UH49AuLcfwtbD5BClU4TGnveWeOmiMIiOMMgoxzyml42NSwPA7oUJinMPJXPBCEA==",
-      "requires": {
-        "@remixproject/engine": "0.3.19",
-        "@remixproject/plugin-api": "0.3.19",
-        "@remixproject/plugin-utils": "0.3.19"
-      }
-    },
-    "@remixproject/plugin": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.19.tgz",
-      "integrity": "sha512-jEG0ge0ku1TfFU/46ckvzB0Q7WyeUEQhvatv1oMrVTHUj2o8B0u500V92AcI0YNcxXjn5UNNrHGQBgLcNvYG6Q==",
-      "requires": {
-        "@remixproject/plugin-api": "0.3.19",
-        "@remixproject/plugin-utils": "0.3.19",
->>>>>>> 02d978945 (icons)
         "events": "3.2.0"
       },
       "dependencies": {
@@ -54139,7 +54111,6 @@
       }
     },
     "@remixproject/plugin-api": {
-<<<<<<< HEAD
       "version": "0.3.20-alpha.2",
       "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.20-alpha.2.tgz",
       "integrity": "sha512-4YuTVgi3BhAOyuk3y/0kyxERsI6BwIo/bg/909GbvKbzKEelsLZqCX/vP9C62vEWc/Elh/QnT769Ld51SGAUTQ==",
@@ -54151,19 +54122,6 @@
       "version": "0.3.20-alpha.2",
       "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.20-alpha.2.tgz",
       "integrity": "sha512-U3eIpvFPomt9Iv7UXCav7yP9jA/GhQWJ5T1OQx6y3excdL32hOXdbODvb2Fs/B/41Xm33VDtOnwxop/2L793fg==",
-=======
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.19.tgz",
-      "integrity": "sha512-MDCiGYA++5ydncSJUSNe5Fg0qh2fADbMdlCDP8BGsvUfhPEDBRIm8Iw6gYYGu9d5S4xDCs0EBMcExqvdweOGEw==",
-      "requires": {
-        "@remixproject/plugin-utils": "0.3.19"
-      }
-    },
-    "@remixproject/plugin-utils": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.19.tgz",
-      "integrity": "sha512-++L83MmSeV4Hri4uldOB0iNqwOAN/3eAnYorpiSCpKJbeQzT08KyorQ6B3FAiG/EM0pF/o+sPZbNtSJuHCUfIw==",
->>>>>>> 02d978945 (icons)
       "requires": {
         "tslib": "2.0.1"
       },
@@ -54176,7 +54134,6 @@
       }
     },
     "@remixproject/plugin-webview": {
-<<<<<<< HEAD
       "version": "0.3.20-alpha.2",
       "resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.20-alpha.2.tgz",
       "integrity": "sha512-FgkyPtRvFBuFF7zfrIPGGnVa/sjfl8Xjf0vK6ZEGi0EHbgRBk2OloViU+nBWrgezKlvQBIsxM/7iUODmXjFd7g==",
@@ -54184,20 +54141,10 @@
         "@remixproject/plugin": "0.3.20-alpha.2",
         "@remixproject/plugin-api": "0.3.20-alpha.2",
         "@remixproject/plugin-utils": "0.3.20-alpha.2",
-=======
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.19.tgz",
-      "integrity": "sha512-TQiw0Zzm5ZDNmRR7sT9PzF6QmnhBlnTKmJ4X9DpV8ir1en8iG5Uopc5h8RnHc/YFiCVZyQyrjWi2bpSVmAFRuA==",
-      "requires": {
-        "@remixproject/plugin": "0.3.19",
-        "@remixproject/plugin-api": "0.3.19",
-        "@remixproject/plugin-utils": "0.3.19",
->>>>>>> 02d978945 (icons)
         "axios": "^0.21.1"
       }
     },
     "@remixproject/plugin-ws": {
-<<<<<<< HEAD
       "version": "0.3.20-alpha.2",
       "resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.20-alpha.2.tgz",
       "integrity": "sha512-00K0tunbYy9DfskgwgUFL3ncZ0aT577gYk/7wOD6iPYnahpAKGzj+rO/FydWXlvQ7Rdw/j9QeuPGFs84mwxD+g==",
@@ -54205,15 +54152,6 @@
         "@remixproject/plugin": "0.3.20-alpha.2",
         "@remixproject/plugin-api": "0.3.20-alpha.2",
         "@remixproject/plugin-utils": "0.3.20-alpha.2"
-=======
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.19.tgz",
-      "integrity": "sha512-6c7CwkjKLzXZJ+/GkExOOHcyXYw0Zlo3JisEniEcNqQ8epSIZ7tZIW23ATiNsEnsGBR5GiB0IyQFWSWjSKxBRA==",
-      "requires": {
-        "@remixproject/plugin": "0.3.19",
-        "@remixproject/plugin-api": "0.3.19",
-        "@remixproject/plugin-utils": "0.3.19"
->>>>>>> 02d978945 (icons)
       }
     },
     "@restart/context": {
@@ -55022,12 +54960,17 @@
     "@types/yargs-parser": {
       "version": "15.0.0",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+<<<<<<< HEAD
 <<<<<<< HEAD
       "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
       "dev": true
 =======
       "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="
 >>>>>>> 02d978945 (icons)
+=======
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "dev": true
+>>>>>>> 7c76806a9 (lock file)
     },
     "@typescript-eslint/eslint-plugin": {
       "version": "3.6.1",