diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
index 04946d54d98..b4664d73e83 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld
@@ -16,7 +16,7 @@ esf_buf_recycle = 0x40001ae8;
 hal_mac_tx_set_ppdu = 0x40001af8;
 ic_mac_deinit = 0x40001b00;
 lmacAdjustTimestamp = 0x40001b10;
-lmacDiscardMSDU = 0x40001b18;
+/*lmacDiscardMSDU = 0x40001b18;*/
 lmacEndFrameExchangeSequence = 0x40001b1c;
 lmacMSDUAged = 0x40001b28;
 //lmacSetTxFrame = 0x40001b4c;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
index 73d17bd3482..1cb8c9b0685 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -8,7 +8,7 @@ esf_buf_alloc_dynamic = 0x400015c0;
 esf_buf_recycle = 0x400015c4;
 /*hal_mac_tx_set_ppdu = 0x400015d4;*/
 ic_mac_deinit = 0x400015dc;
-lmacDiscardMSDU = 0x400015f4;
+/*lmacDiscardMSDU = 0x400015f4;*/
 /*lmacSetTxFrame = 0x40001628;*/
 lmacTxDone = 0x4000162c;
 lmacTxFrame = 0x40001630;
diff --git a/examples/bluetooth/bluedroid/ble_50/multi-adv/main/multi_adv_demo.c b/examples/bluetooth/bluedroid/ble_50/multi-adv/main/multi_adv_demo.c
index d0241470c24..81a7ed6858b 100644
--- a/examples/bluetooth/bluedroid/ble_50/multi-adv/main/multi_adv_demo.c
+++ b/examples/bluetooth/bluedroid/ble_50/multi-adv/main/multi_adv_demo.c
@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
  * SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD
-=======
- * SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD
->>>>>>> 0770fb4638e... refactor(examples/bluedroid): Replace hardcoded ADV type values with macros
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */