fix merge and future build error