getting the conflict right