IVY-813: added a 'nearest' conflict manager
6 files changed