update vimrc
resolve conflicts