fixed conflict

src/app/panels/file-panel.js

@@ -66,7 +66,7 @@ module.exports = class Filepanel extends ViewPlugin {
     var gistExplorer = createProvider('gist', ['updateGist'])
     var httpExplorer = createProvider('http')
     var httpsExplorer = createProvider('https')
-    var httpsExplorer = createProvider('ipfs')
+    var ipfsExplorer = createProvider('ipfs')
 
     self.remixdHandle = new RemixdHandle(fileSystemExplorer, self._deps.fileProviders['localhost'], appManager)
 
@@ -79,6 +79,7 @@ module.exports = class Filepanel extends ViewPlugin {
         <div class="gistexplorer ${css.treeview}">${gistExplorer.init()}</div>
         <div class="httpexplorer ${css.treeview}">${httpExplorer.init()}</div>
         <div class="httpsexplorer ${css.treeview}">${httpsExplorer.init()}</div>
+        <div class="ipfsexplorer ${css.treeview}">${ipfsExplorer.init()}</div>
       </div>
     `
 

src/app/tabs/compile-tab.js

@@ -233,18 +233,7 @@ class CompileTab extends ViewPlugin {
         ${selectEl}
       </div>
       <article class="${css.compilerArticle}">
-<<<<<<< HEAD
         <button class="btn btn-secondary btn-block" title="Publish on Swarm" onclick="${() => { this.publish('swarm') }}">
-=======
-        <button class="btn btn-secondary btn-block" title="Publish on Swarm" onclick="${() => { this.publish() }}">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-          <i class="${css.copyIcon} fas fa-upload" aria-hidden="true"></i>
->>>>>>> c353b990... standard
->>>>>>> c049685c... standard
-=======
->>>>>>> 1eeb61d4... added dummy functions to interface
           <span>Publish on Swarm</span>
           <img id="swarmLogo" class="${css.storageLogo} ml-2" src="${swarmImg}">
         </button>