fix merge conflict

src/app/files/fileManager.js

@@ -40,10 +40,6 @@ class FileManager {
     self._deps.gistExplorer.event.register('fileRemoved', (path) => { this.fileRemovedEvent(path) })
     self._deps.localhostExplorer.event.register('errored', (event) => { this.removeTabsOf(self._deps.localhostExplorer) })
     self._deps.localhostExplorer.event.register('closed', (event) => { this.removeTabsOf(self._deps.localhostExplorer) })
-<<<<<<< HEAD
-=======
-
->>>>>>> User `events` and `EventEmitter` instead of `event` and `EventManager`
   }
 
   profile () {

src/app/tabs/compile-tab.js

@@ -338,14 +338,9 @@ class CompileTab {
 
     this._view.errorContainer = yo`<div></div>`
     this._view.contractSelection = this.contractSelection()
-<<<<<<< HEAD
     this._view.compilerContainer = this.compilerContainer.render()
     const currentFile = this._deps.fileManager.currentFile()
     if (currentFile) this.compilerContainer.currentFile = currentFile
-=======
-    this.compilerContainer.currentFile = this._deps.fileManager.currentFile()
-    this._view.compilerContainer = this.compilerContainer.render()
->>>>>>> User `events` and `EventEmitter` instead of `event` and `EventManager`
 
     this._view.el = yo`
       <div id="compileTabView">