Part 3 - How do we handle conflict?