update gitignore
merge conflicts