diff --git a/src/views/mobile/RankingList.vue b/src/views/mobile/RankingList.vue
index f429cc3..99278d0 100644
--- a/src/views/mobile/RankingList.vue
+++ b/src/views/mobile/RankingList.vue
@@ -196,12 +196,7 @@ export default {
     };
   },
   created() {
-<<<<<<< HEAD
-    this.loadLocalData();
-    if (!this.account) {
-=======
     if (!this.$store.state.account) {
->>>>>>> 143601a9eaaf179ba4addf3ef9f3f4ab6b329dab
       return;
     }
     this.$axios
@@ -238,7 +233,6 @@ export default {
     }, 500);
   },
   methods: {
-<<<<<<< HEAD
     loadLocalData() {
       let userInfo = localStorage.getItem("userinfo");
       if (userInfo) {
@@ -248,8 +242,6 @@ export default {
         } catch (err) {}
       }
     },
-=======
->>>>>>> 143601a9eaaf179ba4addf3ef9f3f4ab6b329dab
     navigator() {
       this.$router.push("listdetails");
     },