DiffViewUtils::Conflicting