Fix #1598 - Ivy fails to load evicted information.

Upgrade to a version of ivy 2.3.0 that has a backported fix for conflict resolver.


Review by @eed3si9n