diff --git a/src/views/GroupEvolution/component/groupChart.vue b/src/views/GroupEvolution/component/groupChart.vue
index 1eda319..837a9fc 100644
--- a/src/views/GroupEvolution/component/groupChart.vue
+++ b/src/views/GroupEvolution/component/groupChart.vue
@@ -122,15 +122,9 @@ const initChart = () => {
       itemWidth: 10, // 图例图标的宽度
       itemHeight: 10, // 图例图标的高度
       textStyle: {
-<<<<<<< HEAD
-        color: "#fff",
-        fontSize: 12
-      }
-=======
         color: "#fff"
       },
       icon: "circle" // 使用圆形图标
->>>>>>> 0b728495e801a874026a766723835be2eaba7833
     },
     tooltip: {
       trigger: "axis",