Solve conflict routes
Merge branch 'master' of github.com:ZixuanGong/high_school