diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 5164d94e..a20d40a3 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -557,11 +557,6 @@ import * as apieval from "../../api/indexEval";
 import * as apiinvist from "../../api/indexInvist";
 import * as apivote from "../../api/indexVote";
 import * as apistage from "../../api/indexStage";
-<<<<<<< HEAD
-import * as apistage from "../../api/indexStage";
-=======
-import * as apivote from "../../api/indexVote";
->>>>>>> 096d42b09e588582d20dd3350d5115d6678da009
 const drawercolumns = [
   {
     title: "项目名称",