fix merge error

.gitignore

@@ -56,4 +56,4 @@ server/models_list.json
 server/models_status.json
 libreoffice-server/__pycache__/main.cpython-312.pyc
 nul
-.sisyphus/
+.sisyphus/

web/utils/translations.ts

@@ -418,8 +418,6 @@ export const translations = {
     navTenants: "租户管理",
     navSystemModels: "系统模型",
     navTenantManagement: "租户管理",
-    defaultTenant: "默认租户",
-    selectOrganization: "选择组织",
     navUsersTeam: "用户与团队",
     navTenantSettings: "租户设置",
     adminConsole: "管理控制台",
@@ -903,8 +901,6 @@ export const translations = {
     navTenants: "Tenants",
     navSystemModels: "System Models",
     navTenantManagement: "Tenant Management",
-    defaultTenant: "Default Tenant",
-    selectOrganization: "Select Organization",
     navUsersTeam: "Users & Teams",
     navTenantSettings: "Tenant Settings",
     adminConsole: "Admin Console",