update readme bingxie
merge confilt with readme