Updated EnrollmentDao after conflict