how to address conflict