Wip/backport conflict issue fix

Merge fix to "no data available" upon conflicts of evicted dependencies.


Review by @eed3si9n