[SQUASHME] build / merge fixes