Resolve the conflict