sigh..fix conflicts

gui.js

@@ -7199,11 +7199,7 @@ CostumeIconMorph.prototype.exportCostume = function () {
         // don't show SVG costumes in a new tab (shows text)
         ide.saveFileAs(this.object.contents.src, 'text/svg', this.object.name);
     } else { // rasterized Costume
-<<<<<<< HEAD
         ide.saveCanvasAs(this.object.contents, this.object.name);
-=======
-        ide.saveCanvasAs(this.object.contents, this.object.name, false);
->>>>>>> master
     }
 };