diff --git a/components/bt/include/esp32s3/include/esp_bt.h b/components/bt/include/esp32s3/include/esp_bt.h
index 331896e920..35a1183737 100644
--- a/components/bt/include/esp32s3/include/esp_bt.h
+++ b/components/bt/include/esp32s3/include/esp_bt.h
@@ -448,26 +448,6 @@ void esp_bt_controller_wakeup_request(void);
  */
 int esp_bt_h4tl_eif_io_event_notify(int event);
 
-<<<<<<< HEAD
-=======
-/**
- * @brief bt Wi-Fi power domain power on
- */
-void esp_wifi_bt_power_domain_on(void);
-
-/**
- * @brief bt Wi-Fi power domain power off
- */
-void esp_wifi_bt_power_domain_off(void);
-
-/**
- * @brief Register application callback function to Wi-Fi low power clock module.
- *
- * @param callback : Wi-Fi set low power clock callback function
- */
-void esp_wifi_set_lpclk_register_callback(esp_set_lpclk_source_callback_t callback);
-
->>>>>>> 8f0c559c03... make bluetooth and wifi use the same low power clock
 #ifdef __cplusplus
 }
 #endif