Conflict resolving API.