update merge chongrui