solved .gitignore conflict