fix mismerged things / fix build