update .gitignore
merge conflict