Name and data added to my slot in the roster
Fixing merge conflict