added user name field and updated for when user is created
merge conflict
merge conflict