hi, pls merge my update