merge with jiamin modified text.