conflict_resolver