diff --git a/app/components/CodeEditor/index.js b/app/components/CodeEditor/index.js
index 4a1c8f6..0f94201 100755
--- a/app/components/CodeEditor/index.js
+++ b/app/components/CodeEditor/index.js
@@ -39,11 +39,10 @@ class CodeEditor extends React.Component {
       this.setModeAndLinter();
       this.codemirror.setValue(this.props.files[this.props.selectedFileIndex].content);
     }
+
     if (this.props.vimMode) {
-      console.log("component updated");
       this.codemirror.setOption('keyMap', 'vim');
     } else {
-      console.log("component updated else");
       this.codemirror.setOption('keyMap', 'default');
     }
   }
diff --git a/app/components/Toolbar/index.js b/app/components/Toolbar/index.js
index 6dca704..1004a3b 100644
--- a/app/components/Toolbar/index.js
+++ b/app/components/Toolbar/index.js
@@ -20,7 +20,7 @@ import Boilerplates from '../Boilerplates';
   showInfo: 'bin.showInfo',
   showLog: 'bin.showLog',
   showBoilerplatesSelector: 'bin.showBoilerplatesSelector',
-  shouldCheckLog: 'bin.shouldCheckLog'
+  shouldCheckLog: 'bin.shouldCheckLog',
   showBoilerplatesSelector: 'bin.showBoilerplatesSelector',
   vimModeEnabled: 'bin.vimMode'
 })
@@ -60,6 +60,7 @@ class Toolbar extends React.Component {
             value={this.props.newFileName}/>
         </div>
         <div className={styles.column}>
+          {/*
           <div className={styles.buttonWrapper}>
             Vim Mode
             <input
@@ -67,6 +68,7 @@ class Toolbar extends React.Component {
               checked={this.props.vimModeEnabled}
               onClick={() => this.props.signals.bin.vimModeClicked()}/>
           </div>
+          */}
           <div className={styles.buttonWrapper}>
             <ToolbarButton
               title='Run'
diff --git a/app/modules/Bin/index.js b/app/modules/Bin/index.js
index 6cc786e..3dd681d 100755
--- a/app/modules/Bin/index.js
+++ b/app/modules/Bin/index.js
@@ -92,12 +92,9 @@ export default (options = {}) => {
       boilerplateClicked,
       linterRequested,
       linterLoaded,
-<<<<<<< HEAD
       logToggled,
-      logReceived
-=======
+      logReceived,
       vimModeClicked
->>>>>>> origin/master
     });
 
   };