More conflicts

When will we ever learn to love?
Conflict 2

Trying again
Resolving conflict

Making sure I got this