merge repo, update `.vimrc`