diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 37137825..a724acc0 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -462,21 +462,12 @@ async function confirm() {
     throw Error("数据校验不通过");
   });
   if (taskIndex.value === -1) {
-<<<<<<< HEAD
     let list = props.taskList
     list.push(
             {name: formData.value.liveName,
               type: props.type,
               info: {...formData.value}
             })
-=======
-    const list = props.taskList;
-    list.push({
-      name: formData.value.liveName,
-      type: props.type,
-      info: { ...formData.value },
-    });
->>>>>>> 3e84518fc6431b5650dd225e2a6ff09936fbffe0
   } else {
     const data = props.taskList[taskIndex.value];
     data.name = formData.value.liveName;