Adds gitignore
resolves conflicts