fix merge bug
Merge branch 'jack' of https://github.com/lln7777/zhuyun into user