Conflict resolved.