more merge fixes, I should really compile it before submitting a pull request