diff --git a/static/js/index.js b/static/js/index.js
index 3b87af8..de1ebe6 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -747,11 +747,7 @@ function saveRemoteAudio() {
     // checking the new state
     setTimeout(function() {
         var remoteAudioState = $("#remoteAudioEnabledSwitch").parent().hasClass('is-checked');
-<<<<<<< HEAD
         console.log('%c[index.js, saveRemoteAudio]', 'color: green;', 'Saving remote audio state : ' + remoteAudioState);
-=======
-        console.log('[index.js, saveRemoteAudio]', 'color: green;', 'Saving remote audio state : ' + remoteAudioState);
->>>>>>> 66da3a7c871a55d13807c137b9f8d13654b46267
         storeData('remoteAudio', remoteAudioState, null);
     }, 100);
 }