Fix tag color and resolve merge conflict in Scheduler.vue

Changed the tag color for '碳-5' from 'none' to 'default' in Plans.vue. Also resolved a merge conflict in Scheduler.vue related to the .plan-header class styling.

frontend/src/views/Plans.vue

@@ -853,7 +853,7 @@ const getSimpleTaskTagColor = (taskName: string) => {
     '红票-5': 'volcano',
     '技能-5': 'cyan',
     '经验-6/5': 'gold',
-    '碳-5': 'none',
+    '碳-5': 'default',
     '奶/盾芯片': 'green',
     '奶/盾芯片组': 'green',
     '术/狙芯片': 'purple',

frontend/src/views/Scheduler.vue

@@ -941,10 +941,15 @@ onUnmounted(() => {
   display: flex;
   justify-content: space-between;
   align-items: center;
+<<<<<<< Updated upstream
   margin-bottom: 16px;
   padding: 16px;
   border-radius: 8px;
   border: 1px solid var(--ant-color-border);
+=======
+  padding: 8px 16px;
+  border-bottom: 1px solid #d9d9d9;
+>>>>>>> Stashed changes
 }
 
 .left-actions {