From e85339e06ec2eee3ead41bbf44ee701a85c06df6 Mon Sep 17 00:00:00 2001
From: fatelei <fatelei@gmail.com>
Date: Wed, 2 Sep 2026 09:14:24 +0800
Subject: [PATCH] fix: fix conflict

---
 api/controllers/console/agent/roster.py                        | 2 +-
 .../controllers/console/agent/test_agent_controllers.py        | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/api/controllers/console/agent/roster.py b/api/controllers/console/agent/roster.py
index ee469d8053f..b23252ab472 100644
--- a/api/controllers/console/agent/roster.py
+++ b/api/controllers/console/agent/roster.py
@@ -79,8 +79,8 @@ from services.agent.observability_service import (
 )
 from services.agent.roster_service import AgentRosterService
 from services.app_service import AgentAppPublicationCounts, AppListParams, AppService, CreateAppParams
-from services.enterprise.enterprise_service import EnterpriseService
 from services.enterprise import rbac_service as enterprise_rbac_service
+from services.enterprise.enterprise_service import EnterpriseService
 from services.entities.agent_entities import ComposerSavePayload, RosterListQuery
 from services.system_feature_service import SystemFeatureService
 from tasks.initialize_created_app_rbac_access_task import initialize_created_app_rbac_access_task
diff --git a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
index 706e399d588..34da8fe9e5a 100644
--- a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
+++ b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
@@ -598,7 +598,6 @@ def test_agent_app_list_and_create_use_agent_route(
         "account_id": account_id,
         "commit": False,
     }
-<<<<<<< HEAD
 
 
 def test_agent_app_create_skips_rbac_access_initialization_when_rbac_is_disabled(
@@ -669,8 +668,6 @@ def test_agent_app_create_skips_rbac_access_initialization_when_rbac_is_disabled
     assert created["id"] == "agent-created"
     replace_whitelist.assert_not_called()
     initialize_access.assert_not_called()
-=======
->>>>>>> feat/app-access-point-permission
 
 
 def test_agent_app_create_payload_allows_optional_role() -> None: