.gitignore conflict resolved