Update Roster
Fix merge conflicts