Addressing the conflict