have learn it
changed on master branch
conflict fixed
增加一些中文
fixed some conflixConflict