Fixed a few bugs in create character
Fixed merge conflicts