diff --git a/src/pages/match/manage/index.vue b/src/pages/match/manage/index.vue
index 48eb140..2449f46 100644
--- a/src/pages/match/manage/index.vue
+++ b/src/pages/match/manage/index.vue
@@ -50,12 +50,8 @@ export default {
         });
     },
     beforeDestroy() {
-        // 关闭所以EventBus事件
-<<<<<<< HEAD
+        // 关闭所有EventBus事件
        EventBus.$off()
-=======
-        EventBus.$off()
->>>>>>> 8af271dbd54e96d906dc849c3b61128fbf4e7018
     },
     methods: {
         goBack() {
diff --git a/src/router/index.js b/src/router/index.js
index 2431210..f0c8967 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -268,11 +268,7 @@ router.beforeEach(function(to, from, next) {
     }
     // 根据路由元信息设置文档标题
     // window.document.title = to.meta.title ? to.meta.title : "";
-<<<<<<< HEAD
     window.document.title = "教师管理端"
-=======
-    window.document.title = "职站教师端"
->>>>>>> 8af271dbd54e96d906dc849c3b61128fbf4e7018
     next();
 
 });
\ No newline at end of file