week 4 class work and homework
fixed conflicts