注册报错
Merge remote-tracking branch 'origin/master' into launch