diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 0748e89da..3b49bbfbe 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -578,21 +578,10 @@ export default {
                     {path: 'archivedProject', name: '已归档的项目'},
 
                     {path: 'team', name: '团队管理', divided: true},
-<<<<<<< HEAD
-                    {path: 'approve', name: '审批中心'},
-                    {path: 'okrManage', name: 'OKR管理'},
-                    {path: 'okrAnalyze', name: 'OKR结果分析'},
-=======
->>>>>>> pro
                 ])
             } else {
                 array.push(...[
                     {path: 'personal', name: '个人设置', divided: true},
-<<<<<<< HEAD
-                    {path: 'approve', name: '审批中心'},
-                    {path: 'okrManage', name: 'OKR管理'},
-=======
->>>>>>> pro
                     {path: 'version', name: '更新版本', divided: true, visible: !!this.clientNewVersion},
 
                     {path: 'workReport', name: '工作报告', divided: true},
diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index 8dcaf9e08..1452765b8 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -728,10 +728,7 @@ export default {
                 this.changeLoad++
                 this.textTimer && clearTimeout(this.textTimer)
                 this.textTimer = setTimeout(_ => {
-<<<<<<< HEAD
-=======
                     this.changeLoad--
->>>>>>> pro
                     if (this.maxlength > 0 && this.quill.getLength() > this.maxlength) {
                         this.quill.deleteText(this.maxlength, this.quill.getLength());
                     }