diff --git a/store/modules/im.js b/store/modules/im.js
index 10bfeac..01e2b92 100644
--- a/store/modules/im.js
+++ b/store/modules/im.js
@@ -47,14 +47,10 @@ export default {
                 name: contactInfo.name,
                 portraitUrl: contactInfo.portraitUrl
             }
-<<<<<<< HEAD
-        }
-=======
         },
         setContactRemark(state, contactInfo) {
             Vue.set(state.contacts, contactInfo.targetId, contactInfo)
         }
->>>>>>> 013c030963aef06a00ac33d5f767cbd97ef2ceac
     },
     actions: {
         setContactRemark({