Resolved conflict with Instructor and Admin Controllers