Add all the things
Correct merge conflict in .gitignore