modified .vimrc
resolve CONFLICT