alphabetized mentors
fixing merge