addressing conflicts