Corrected .gitignore conflict