diff --git a/share/web_surfaces/builtin/mixer/js/main.js b/share/web_surfaces/builtin/mixer/js/main.js
index e7dc9fa66e..8427e89aba 100644
--- a/share/web_surfaces/builtin/mixer/js/main.js
+++ b/share/web_surfaces/builtin/mixer/js/main.js
@@ -138,12 +138,7 @@ import { createRootContainer, Container, Dialog, Label, Button, DiscreteKnob,
 
     function setupFullscreenButton () {
         const doc = document.documentElement,
-<<<<<<< HEAD
               button = document.getElementById('fullscreen');
-=======
-              button = document.getElementById('fullscreen'),
-              touchOrClick = ('ontouchstart' in doc) ? 'touchstart' : 'click';
->>>>>>> WS: Add a fullscreen toggle to the mixer demo
 
         let requestFullscreen = null, fullscreenChange = null;