merge with xiaoqin