diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 8ac0ed9b..6caa1c9a 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1028,23 +1028,7 @@
             <div class="close_exit" @click="closeDeleteStage"></div>
           </div>
           <div class="body">
-<<<<<<< HEAD
             <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
-=======
-            <span
-              style="
-                width: 320px;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-              "
-              >{{
-                level.length == 1
-                  ? "当前阶段为第一阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?"
-                  : "您确定要删除此阶段"
-              }}</span
-            >
->>>>>>> a200f7b8f28615aff68e60edeefa24d9c5dddded
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteStage">