include new file, add user nickname.
Merge branch 'add-unique-user-name'