Edited vimrc
Merged .vimrc