From ea567c80bf10737db4f85b91a3b3b176ed04b8fd Mon Sep 17 00:00:00 2001
From: crazywoola <427733928@qq.com>
Date: Thu, 19 Jun 2025 11:29:11 +0800
Subject: [PATCH] resolve: conflicts

---
 api/core/ops/ops_trace_manager.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/core/ops/ops_trace_manager.py b/api/core/ops/ops_trace_manager.py
index f1b5bdef8d..9ca00c2a47 100644
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@@ -14,6 +14,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.helper.encrypter import decrypt_token, encrypt_token, obfuscated_token
+from core.ops.arize_phoenix_trace.arize_phoenix_trace import ArizePhoenixDataTrace
 from core.ops.entities.config_entity import (
     OPS_FILE_PATH,
     TracingProviderEnum,