Remove useless code from vimrc.
Resolved merge conflict.