updated student profile
temp commit
fix merge conflict