fix merge and update build