diff --git a/.gitmodules b/.gitmodules
index d6e0f75..1bfc82c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,9 +17,6 @@
 [submodule "vim/vim-hybrid"]
 	path = vim/vim-hybrid
 	url = https://github.com/w0ng/vim-hybrid.git
-[submodule "vim/pack/man/nerdtree"]
-	path = vim/pack/man/nerdtree
-	url = https://github.com/preservim/nerdtree.git
 [submodule "vim/pack/man/start/nerdtree"]
 	path = vim/pack/man/start/nerdtree
 	url = https://github.com/preservim/nerdtree.git
diff --git a/install.conf.yaml b/install.conf.yaml
index 4c7cd45..e0fd3cf 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -9,7 +9,9 @@
     - [git submodule update --init --recursive, Installing submodules]
 
 - link: 
-  #~/.dotfiles: '' copied as .dotfiles
+<<<<<<< HEAD
+#    ~/.dotfiles: ''
+>>>>>>> 9147eddc36c12e1aa008d3e55792c7b766d04a38
     ~/.vimrc: vimrc
     ~/.zshrc:
         force: true
diff --git a/vimrc b/vimrc
index 093ff89..d4c3fd9 100644
--- a/vimrc
+++ b/vimrc
@@ -23,9 +23,11 @@ let g:go_highlight_extra_types=1
 
 " nerdtree settings
 let NERDTreeHighlightCursorLine=1
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
 
 " nerdtree binds
 nnoremap <C-n> :NERDTree<CR>
 nnoremap <C-t> :NERDTreeToggle<CR>
-nnoremap <C-f> :NERDTreeFind<CR>
+nnoremap <C-f> :NERDTreeFocus<CR>