fix merge errors/build errors