resolve the conflict