diff --git a/package-lock.json b/package-lock.json
index c5449ed74..508e9a444 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13340,9 +13340,15 @@
       }
     },
     "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",
@@ -13428,9 +13434,15 @@
       }
     },
     "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",
@@ -13522,9 +13534,15 @@
       }
     },
     "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",
diff --git a/src/virtual-machine.js b/src/virtual-machine.js
index 7b56589c6..30e809b6d 100644
--- a/src/virtual-machine.js
+++ b/src/virtual-machine.js
@@ -1090,6 +1090,10 @@ class VirtualMachine extends EventEmitter {
         return this.runtime && this.runtime.renderer;
     }
 
+    // @deprecated
+    attachV2SVGAdapter () {
+    }
+
     /**
      * Set the bitmap adapter for the VM/runtime, which converts scratch 2
      * bitmaps to scratch 3 bitmaps. (Scratch 3 bitmaps are all bitmap resolution 2)