I think we could revert this change provided we used a `foreach` loop in `ConflictCollection`.