vimrc updates
merge conflicts