Refactoring class ManageReserveRoomTeacher
Conflict Resolution