fix merge error.