fix merge error