adding the conflict back