diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
index 45d157a946c..a3601ad8d3b 100644
--- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
+++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx
@@ -96,13 +96,10 @@ export interface TeamData {
     } | null;
     created_at: string;
     access_group_ids?: string[];
-<<<<<<< worktree-rustling-wishing-kite
     default_team_member_models?: string[];
-=======
     access_group_models?: string[];
     access_group_mcp_server_ids?: string[];
     access_group_agent_ids?: string[];
->>>>>>> main
     guardrails?: string[];
     policies?: string[];
     object_permission?: {