Remove .DS_Store files
Update roster
Fix conflicts