[434828] Test Merge Conflict Diff With Conflicting Diff With RequiredBy