fix .gitignore conflict