diff --git a/app/views/play/level/LevelPlaybackView.coffee b/app/views/play/level/LevelPlaybackView.coffee
index 0bb7a1bef..6949fce6e 100644
--- a/app/views/play/level/LevelPlaybackView.coffee
+++ b/app/views/play/level/LevelPlaybackView.coffee
@@ -339,11 +339,8 @@ module.exports = class LevelPlaybackView extends CocoView
         @slideCount = 0
         @wasPlaying = @playing
         Backbone.Mediator.publish 'level:set-playing', {playing: false}
-<<<<<<< HEAD
-        Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-start', volume: .01
-=======
         Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-start', volume: 0.5
->>>>>>> 8c37fabe7990e8409591fee65c18593bb64aee5c
+
 
       stop: (event, ui) =>
         return if @shouldIgnore()
@@ -355,11 +352,8 @@ module.exports = class LevelPlaybackView extends CocoView
           Backbone.Mediator.publish 'level:set-playing', {playing: false}
           @$el.find('.scrubber-handle').effect('bounce', {times: 2})
         else
-<<<<<<< HEAD
-          Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-end', volume: .01
-=======
           Backbone.Mediator.publish 'audio-player:play-sound', trigger: 'playback-scrub-end', volume: 0.5
->>>>>>> 8c37fabe7990e8409591fee65c18593bb64aee5c
+
     )
 
   getScrubRatio: ->