update .gitignore
Fixed conflicts