fix confilct
Merge branch 'master' of https://github.com/jianzhongliu/BaiKe