dealt with the conflict