mod .vimrc
merging