.vimrc 更新
CONFLICT (content): Merge conflict in .vimrc