added enrollment table
fixed conflicts