rid the conflict