fix resolve conflix from xiaoli branch