fix merge conflict

src/app.js

@@ -334,16 +334,14 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   const themeModule = new ThemeModule(registry)
   registry.put({api: themeModule, name: 'themeModule'})
 
-<<<<<<< HEAD
   // ----------------- main view ----------------------
   self._components.mainview = new MainView(appStore, appManager, mainPanelComponent)
   registry.put({ api: self._components.mainview, name: 'mainview' })
-=======
+
   // ----------------- landing page ----------------------------
   // Need to have Home initialized before VerticalIconComponent render to access profile of it for icon
   const landingPage = new LandingPage(appManager, appStore)
 
->>>>>>> fix browser issue
   // ----------------- Vertical Icon ----------------------------
   const verticalIcons = new VerticalIcons('swapPanel', appStore, landingPage)
   registry.put({api: verticalIcons, name: 'verticalicon'})
@@ -372,21 +370,12 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   pluginManagerComponent.setApp(appManager)
   pluginManagerComponent.setStore(appStore)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 
   self._components.mainview.init()
-=======
-=======
+
   // Need to have Home initialized before VerticalIconComponent render to access profile of it for icon
   const landingPage = new LandingPage(appManager, appStore)
 
->>>>>>> Fix tests
-=======
->>>>>>> fix browser issue
-  self._components.editorpanel.init()
->>>>>>> standard
   self._components.fileManager.init()
   self._view.mainpanel.appendChild(self._components.mainview.render())
   self._view.iconpanel.appendChild(verticalIconsComponent.render())