error_resolve_conflict: rewrap advice message