removed alert from student portal js
fixed merge conflicts student portal js