work vimrc changes
resolve merge