Fix create character
Merge