updated vimrc
fix merge