API Merge: Merged classes for instructors and students