Facing and addressing conflict