added my github name
fix attendees merge conflict