advice: Introduce error_resolve_conflict