fix the confilct
Merge branch 'master' of https://github.com/zhishan/myHadoopBook
hotfix