Added self to roster
Merge conflict
merge conflict