注册页面，增加
Merge remote-tracking branch 'origin/master'