conflict stuff
gitignore mac derp