Fixed merge conflict

vim/vimrc

@@ -27,6 +27,7 @@ set bg=dark " set dark background
 set wildmode=longest,list,full
 set mouse=a " enable mouse
 set splitright " always split right
+set viminfo+=n$HOME/.vim/viminfo " save viminfo in .vim dir to keep ~/ clean
 
 " Set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim