HW3
First ever conflict resolution!
Homework 4 complete