fixed merge
Fixed problems with FieldParser, NicknameGenerator