diff --git a/src/drawer.js b/src/drawer.js
index 633d6086..abb432f3 100644
--- a/src/drawer.js
+++ b/src/drawer.js
@@ -395,7 +395,6 @@ $.Drawer.prototype = /** @lends OpenSeadragon.Drawer.prototype */{
             this.canvas.width,
             this.canvas.height
         );
->>>>>>> a0a44dbeb5e3030e0acecf108efc19dbd53aaec2
         this.context.restore();
     },
 
diff --git a/src/tiledimage.js b/src/tiledimage.js
index 3e084ad1..7caa17c9 100644
--- a/src/tiledimage.js
+++ b/src/tiledimage.js
@@ -147,7 +147,7 @@ $.TiledImage = function( options ) {
         debugMode:              $.DEFAULT_SETTINGS.debugMode,
         crossOriginPolicy:      $.DEFAULT_SETTINGS.crossOriginPolicy,
         placeholderFillStyle:   $.DEFAULT_SETTINGS.placeholderFillStyle,
-        opacity:                $.DEFAULT_SETTINGS.opacity
+        opacity:                $.DEFAULT_SETTINGS.opacity,
         compositeOperation:     $.DEFAULT_SETTINGS.compositeOperation
 
     }, options );
@@ -1342,7 +1342,6 @@ function drawTiles( tiledImage, lastDrawn ) {
         sketchScale = tile.getScaleForEdgeSmoothing();
         sketchTranslate = tile.getTranslationForEdgeSmoothing(sketchScale);
     }
->>>>>>> a0a44dbeb5e3030e0acecf108efc19dbd53aaec2
 
     if ( useSketch ) {
         tiledImage._drawer._clear( true );