more weird merge fixes
delete build
Merge pull request #204 from nikolaswise/master

did do some good dids