Fix conflict in vimrc