Core/Player:
- Fix merge fail
- Fix SkillRaceClassInfo structure