First
Fixed .gitignore conflict