add .gitignore
update vimrc
fix conflict