diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue
index 3c17a9b..d2a6df0 100644
--- a/src/pages/mediation-page/components/MediationRoom.vue
+++ b/src/pages/mediation-page/components/MediationRoom.vue
@@ -367,10 +367,7 @@ export default {
       elapsedTime: 0,
       timerInterval: null,
       isRunning: false,
-<<<<<<< HEAD
       contactId: '',
-=======
-
       // 未接来电
       missedCallVisible: false,
       missedCallData: {
@@ -379,7 +376,6 @@ export default {
       // 视频提醒
       videoReminderVisible: false,
       videoReminderData: {}
->>>>>>> 5d050e83e2826b0ae129388b597928682f1bcc9a
     };
   },
   computed: {