Resolve the conflict.