Update roster.txt
fix the conflict
rectifying merge conflict