- fix build, bad merge and test unit