diff --git a/quantdinger_vue/src/views/trading-assistant/index.vue b/quantdinger_vue/src/views/trading-assistant/index.vue
index 65be1a2cd..be9b7f147 100644
--- a/quantdinger_vue/src/views/trading-assistant/index.vue
+++ b/quantdinger_vue/src/views/trading-assistant/index.vue
@@ -953,10 +953,7 @@
                   <a-checkbox value="telegram">{{ $t('trading-assistant.notify.telegram') }}</a-checkbox>
                   <a-checkbox value="discord">{{ $t('trading-assistant.notify.discord') }}</a-checkbox>
                   <a-checkbox value="webhook">{{ $t('trading-assistant.notify.webhook') }}</a-checkbox>
-<<<<<<< HEAD
                   <a-checkbox value="phone">{{ $t('trading-assistant.notify.phone') }}</a-checkbox>
-=======
->>>>>>> 6876016 (sss)
                 </a-checkbox-group>
                 <div class="form-item-hint">{{ $t('trading-assistant.form.notifyChannelsHint') }}</div>
               </a-form-item>