change vimrc
merge