diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js
index 43c0628efc39bd1e0b571760d83f228e7e4b818b..42f9acf9488ac4f178cf87cb31c84eeb2479b353 100644
--- a/app/assets/javascripts/boards/index.js
+++ b/app/assets/javascripts/boards/index.js
@@ -37,10 +37,7 @@ import tooltip from '~/vue_shared/directives/tooltip'; // eslint-disable-line im
 export default () => {
   const $boardApp = document.getElementById('board-app');
   const Store = gl.issueBoards.BoardsStore;
-<<<<<<< HEAD
   const issueBoardsContent = document.querySelector('.content-wrapper > .js-focus-mode-board');
-=======
->>>>>>> upstream/master
 
   window.gl = window.gl || {};