diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue
index 2a8060ca..d276679d 100644
--- a/yanzhu-bigscreen/src/components/header.vue
+++ b/yanzhu-bigscreen/src/components/header.vue
@@ -244,15 +244,9 @@ export default {
           break;
         case 6:
           this.$router.push("/greenCarbon");
-<<<<<<< HEAD
           break;  
         case 702:
           this.$router.push("/bimRoaming");
-=======
-          break;
-        case 701:
-          this.$router.push("/bimManage");
->>>>>>> origin/dev_xd
           break;
         case 102:
           this.$router.push("/labor");