gitignore conflict resolve