some changes for .vimrc
merge
merge