add kaixinbao
resolve confict