fixed merge conflict
Merge branch 'xurui'