Fixing error on student page as a result of merge error