fixed merge conflicts on student portal js