correction vimrc
merge