Resolve PBCharacter conflicts

Resolve PBCharacter conflicts