ignore osx crap
big bloaty merge