Resolved conflict with student and studentDB