update gitignore
resolve merge conflict