Anticipating conflict
Resolved conflict