added Gary to attendees_and_learners
resolve merge conflict adding attendee