New minimal .vimrc
vimrc whitespace error
Fixed merge