diff --git a/package-lock.json b/package-lock.json
index 508e9a444..c5449ed74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13340,15 +13340,9 @@
       }
     },
     "scratch-blocks": {
-<<<<<<< HEAD
       "version": "0.1.0-prerelease.20210331033330",
       "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210331033330.tgz",
       "integrity": "sha512-7Z4R0vwBPr4fJHonj4PIlMhoNMxiDdJzLv0elBeVIqS/eblOkicilmkinTxSWdUdAifMHBTnMOUZmA3jF1+htA==",
-=======
-      "version": "0.1.0-prerelease.20210324033606",
-      "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210324033606.tgz",
-      "integrity": "sha512-zCf7mN64RLME1tA9t2HcDEnf5h5+ziMyksbQj3gsWOUylYLrrYksMBw7wprVEMdPBJwz+4HhpcpkkrCQV1NVnw==",
->>>>>>> develop
       "dev": true,
       "requires": {
         "exports-loader": "0.6.3",
@@ -13434,15 +13428,9 @@
       }
     },
     "scratch-render": {
-<<<<<<< HEAD
       "version": "0.1.0-prerelease.20210325231800",
       "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20210325231800.tgz",
       "integrity": "sha512-hjiIHRR8SuP/8UKKZ4O+TIJaCZ2wSN6uoEM49jwNjZecAaflBvd5t/OLL3NFQp3q7Ra6ncDi+B7URy7WRdm2fg==",
-=======
-      "version": "0.1.0-prerelease.20210317200605",
-      "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20210317200605.tgz",
-      "integrity": "sha512-HbWHTOX9X/jlZw0HINKfHkZ8H7GHiyqR8Cj3jKowHrH2r8bTn7K8DfT3Ql81fepMxVqqeKFPPnpvHwvDEaYWKg==",
->>>>>>> develop
       "dev": true,
       "requires": {
         "grapheme-breaker": "0.3.2",
@@ -13534,15 +13522,9 @@
       }
     },
     "scratch-svg-renderer": {
-<<<<<<< HEAD
       "version": "0.2.0-prerelease.20210325225314",
       "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-0.2.0-prerelease.20210325225314.tgz",
       "integrity": "sha512-I8UObiVUlaxXOfmKTjXqvLZRmPwgn34vaerXKSv3h2B+AXT6sbkV8PtVqbYAIES2Oq0LFPJ9Vk+gmBzKq6Te+w==",
-=======
-      "version": "0.2.0-prerelease.20210317184701",
-      "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-0.2.0-prerelease.20210317184701.tgz",
-      "integrity": "sha512-drHD8kRTU//Rqgs8F6oWmBIQi6TunI86Skvp7BfM+mqalds3GzaPjZHKSCFkdkXbHO4i/zAPLvkQtMDdLm4Y6g==",
->>>>>>> develop
       "dev": true,
       "requires": {
         "base64-js": "1.2.1",