fix build, resolve merge conflicts