Conflicts Resolved 3 - Student.php