blah
fixed merge conflict in .gitignore