fix merge miss