commiting a .gitignore conflict!
we fixed the conflict