Reorganize vimrc.
Fix merge conflict.