fix confilct
Merge branch 'master' of https://github.com/ISeaTeL/ISeaTeL_Cup_Site
gg
Merge branch 'master' of https://github.com/ISeaTeL/ISeaTeL_Cup_Site