diff --git a/web/admin-spa/src/components/apikeys/CreateApiKeyModal.vue b/web/admin-spa/src/components/apikeys/CreateApiKeyModal.vue
index 846c641c..2901db33 100644
--- a/web/admin-spa/src/components/apikeys/CreateApiKeyModal.vue
+++ b/web/admin-spa/src/components/apikeys/CreateApiKeyModal.vue
@@ -433,15 +433,6 @@
                   <option value="">
                     使用共享账号池
                   </option>
-<<<<<<< Updated upstream
-                  <option 
-                    v-for="account in accounts.claude.filter(a => a.isDedicated)" 
-                    :key="account.id" 
-                    :value="account.id"
-                  >
-                    {{ account.name }} ({{ account.status === 'active' ? '正常' : '异常' }})
-                  </option>
-=======
                   <optgroup
                     v-if="localAccounts.claude.filter(a => a.isDedicated && a.platform === 'claude-oauth').length > 0"
                     label="Claude OAuth 账号"
@@ -466,7 +457,6 @@
                       {{ account.name }} ({{ account.status === 'active' ? '正常' : '异常' }})
                     </option>
                   </optgroup>
->>>>>>> Stashed changes
                 </select>
               </div>
               <div>
@@ -891,43 +881,6 @@ const createApiKey = async () => {
       dailyCostLimit: form.dailyCostLimit !== '' && form.dailyCostLimit !== null ? parseFloat(form.dailyCostLimit) : 0,
       expiresAt: form.expiresAt || undefined,
       permissions: form.permissions,
-<<<<<<< Updated upstream
-      claudeAccountId: form.claudeAccountId || undefined,
-      geminiAccountId: form.geminiAccountId || undefined,
-      tags: form.tags.length > 0 ? form.tags : undefined
-    }
-    
-    // 处理Claude账户绑定（区分OAuth和Console）
-    if (form.claudeAccountId) {
-      if (form.claudeAccountId.startsWith('console:')) {
-        // Claude Console账户
-        data.claudeConsoleAccountId = form.claudeAccountId.substring(8);
-      } else {
-        // Claude OAuth账户
-        data.claudeAccountId = form.claudeAccountId;
-      }
-    }
-    
-    // Gemini账户绑定
-    if (form.geminiAccountId) {
-      data.geminiAccountId = form.geminiAccountId;
-    }
-    
-    // 模型限制 - 始终提交这些字段
-    data.enableModelRestriction = form.enableModelRestriction
-    data.restrictedModels = form.restrictedModels
-    
-    // 客户端限制 - 始终提交这些字段
-    data.enableClientRestriction = form.enableClientRestriction
-    data.allowedClients = form.allowedClients
-    
-    const result = await apiClient.post('/admin/api-keys', data)
-    
-    if (result.success) {
-      showToast('API Key 创建成功', 'success')
-      emit('success', result.data)
-      emit('close')
-=======
       tags: form.tags.length > 0 ? form.tags : undefined,
       enableModelRestriction: form.enableModelRestriction,
       restrictedModels: form.restrictedModels,
@@ -967,7 +920,6 @@ const createApiKey = async () => {
       } else {
         showToast(result.message || '创建失败', 'error')
       }
->>>>>>> Stashed changes
     } else {
       // 批量创建
       const data = {
diff --git a/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue b/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
index 996e55bf..ddc12e8e 100644
--- a/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
+++ b/web/admin-spa/src/components/apikeys/EditApiKeyModal.vue
@@ -302,15 +302,6 @@
                   <option value="">
                     使用共享账号池
                   </option>
-<<<<<<< Updated upstream
-                  <option 
-                    v-for="account in accounts.claude" 
-                    :key="account.id" 
-                    :value="account.id"
-                  >
-                    {{ account.name }} ({{ account.status === 'active' ? '正常' : '异常' }})
-                  </option>
-=======
                   <optgroup
                     v-if="localAccounts.claude.filter(a => a.isDedicated && a.platform === 'claude-oauth').length > 0"
                     label="Claude OAuth 账号"
@@ -335,7 +326,6 @@
                       {{ account.name }} ({{ account.status === 'active' ? '正常' : '异常' }})
                     </option>
                   </optgroup>
->>>>>>> Stashed changes
                 </select>
               </div>
               <div>
diff --git a/web/admin-spa/src/views/ApiKeysView.vue b/web/admin-spa/src/views/ApiKeysView.vue
index f049dccd..2db08887 100644
--- a/web/admin-spa/src/views/ApiKeysView.vue
+++ b/web/admin-spa/src/views/ApiKeysView.vue
@@ -12,45 +12,11 @@
         </div>
         <div class="flex flex-col sm:flex-row gap-3 sm:items-center sm:justify-between">
           <!-- Token统计时间范围选择 -->
-<<<<<<< Updated upstream
-          <select 
-            v-model="apiKeyStatsTimeRange" 
-            class="px-2 py-1 text-sm text-gray-700 bg-white border border-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent hover:border-gray-300 transition-colors"
-            @change="loadApiKeys()"
-          >
-            <option value="today">
-              今日
-            </option>
-            <option value="7days">
-              最近7天
-            </option>
-            <option value="monthly">
-              本月
-            </option>
-            <option value="all">
-              全部时间
-            </option>
-          </select>
-          <!-- 标签筛选器 -->
-          <select 
-            v-model="selectedTagFilter" 
-            class="px-2 py-1 text-sm text-gray-700 bg-white border border-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent hover:border-gray-300 transition-colors"
-            @change="currentPage = 1"
-          >
-            <option value="">
-              所有标签
-            </option>
-            <option
-              v-for="tag in availableTags"
-              :key="tag"
-              :value="tag"
-=======
           <div class="flex flex-wrap gap-2 items-center">
             <select 
               v-model="apiKeyStatsTimeRange" 
               class="px-3 py-2 text-sm text-gray-700 bg-white border border-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent hover:border-gray-300 transition-colors"
               @change="loadApiKeys()"
->>>>>>> Stashed changes
             >
               <option value="today">
                 今日
@@ -84,11 +50,7 @@
             </select>
           </div>
           <button 
-<<<<<<< Updated upstream
-            class="btn btn-primary px-6 py-3 flex items-center gap-2"
-=======
             class="btn btn-primary px-4 py-2 text-sm flex items-center gap-2 w-full sm:w-auto justify-center"
->>>>>>> Stashed changes
             @click.stop="openCreateApiKeyModal"
           >
             <i class="fas fa-plus" />创建新 Key
@@ -646,8 +608,6 @@
           </tbody>
         </table>
       </div>
-<<<<<<< Updated upstream
-=======
       
       <!-- 移动端卡片视图 -->
       <div
@@ -946,7 +906,6 @@
           </button>
         </div>
       </div>
->>>>>>> Stashed changes
     </div>
     
     <!-- 模态框组件 -->