diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index f58206cd7..3fa317520 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -133,17 +133,11 @@ export default {
       })
     },
     getLinkData () {
-<<<<<<< HEAD
       this.$get('link').then(response => {
         this.$store.commit('setLinkData', response.data.list)
         // this.linkData = response.data.list
         // console.log(this.linkData);
       }) 
-=======
-      this.$get('link').then(response =>{
-        this.$store.commit('setLinkData',response.data.list)
-      })
->>>>>>> 0f37c1d20484cd184721b1c759597e853126b275
     },
     changeLocal (lang) {
       if (lang != localStorage.getItem('nz-language')) {