Gitignore
Conflict resolved