resolving gitignore conflict