diff --git a/src/app.js b/src/app.js
index 969e2aa1fa..ba504b4149 100644
--- a/src/app.js
+++ b/src/app.js
@@ -321,7 +321,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   const appManager = new RemixAppManager(appStore)
   registry.put({api: appManager, name: 'appmanager'})
 
-
   // ----------------- file manager ----------------------------
   self._components.fileManager = new FileManager()
   const fileManager = self._components.fileManager
@@ -366,8 +365,12 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   pluginManagerComponent.setApp(appManager)
   pluginManagerComponent.setStore(appStore)
 
+<<<<<<< HEAD
 
   self._components.mainview.init()
+=======
+  self._components.editorpanel.init()
+>>>>>>> standard
   self._components.fileManager.init()
   self._view.mainpanel.appendChild(self._components.mainview.render())
   self._view.iconpanel.appendChild(verticalIconsComponent.render())
diff --git a/src/app/components/panel.js b/src/app/components/panel.js
index c4bb259afd..abee8c03e7 100644
--- a/src/app/components/panel.js
+++ b/src/app/components/panel.js
@@ -34,7 +34,7 @@ export class AbstractPanel {
     this.events = new EventEmitter()
     this.contents = {}
     this.active = undefined
-    
+
     // View where the plugin HTMLElement leaves
     this.view = yo`<div id="plugins" class="${css.plugins}"></div>`
 
@@ -70,14 +70,13 @@ export class AbstractPanel {
     })
   }
 
-
   /**
    * Add the plugin to the panel
    * @param {String} name the name of the plugin
    * @param {HTMLElement} content the HTMLContent of the plugin
    */
   add (name, content) {
-    if (!!this.contents[name]) throw new Error(`Plugin ${name} already rendered`)
+    if (this.contents[name]) throw new Error(`Plugin ${name} already rendered`)
     content.style.height = '100%'
     content.style.width = '100%'
     content.style.border = '0'
diff --git a/src/app/components/vertical-icons.js b/src/app/components/vertical-icons.js
index 91733d8138..32a96b7500 100644
--- a/src/app/components/vertical-icons.js
+++ b/src/app/components/vertical-icons.js
@@ -359,7 +359,6 @@ export class VerticalIcons {
   }
 }
 
-
 const css = csjs`
   .homeIcon {
       display: block;