diff --git a/src/views/teacher/message/components/NotificationMessages.vue b/src/views/teacher/message/components/NotificationMessages.vue
index ca3c99a..2f15950 100644
--- a/src/views/teacher/message/components/NotificationMessages.vue
+++ b/src/views/teacher/message/components/NotificationMessages.vue
@@ -85,11 +85,7 @@
               <h4 class="chat-user-name">
                 {{ activeContact?.name }}
                 <span v-if="activeContact?.type === 'group'" class="member-count">({{ activeContact?.memberCount || 0
-<<<<<<< HEAD
                 }}人)</span>
-=======
-                  }}人)</span>
->>>>>>> 75fd712a3291f007aa9678c7772ebb1ba4a9e9ba
               </h4>
             </div>
           </div>
@@ -1822,11 +1818,7 @@ onMounted(() => {
 <style scoped>
 .chat-container {
   display: flex;
-<<<<<<< HEAD
-  height: 75vh;
-=======
   height: calc(100vh - var(--top-height, 130px) - 64px - 145px);
->>>>>>> 75fd712a3291f007aa9678c7772ebb1ba4a9e9ba
   background: #fff;
   border-radius: 4px;
   overflow: hidden;