update Peilin info: a good guy
solve conflicts from Xitong