PBCharacter Resolve Conflict

PBCharacter Resolve Conflict