Update roster.txt
fix the conflict
Fix conflict