fix some bad merges

turns out I can create pull request.

this should fix those bad merges.