fix build merge error