resolve .gitignore conflict