gitignore conflict resolved