resolve conflict in .vimrc