fix merge build error