fix merge error 2