handle the conflict