Comment ALL the things
Builds for OSX
Fix conflicts