终于做对了
Merge branch 'master' of github.com:JSure/OJ
解决冲突