resolved the conflict