From 2919f14100b34dc08e62dc13a512f0d4103cb3f9 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Sun, 5 Oct 2025 17:23:06 -0500
Subject: [PATCH] merge

---
 esphome/components/sha256/sha256.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/esphome/components/sha256/sha256.h b/esphome/components/sha256/sha256.h
index cebcc0034f..a2b62799e1 100644
--- a/esphome/components/sha256/sha256.h
+++ b/esphome/components/sha256/sha256.h
@@ -42,11 +42,7 @@ class SHA256 : public esphome::HashBase {
   // CRITICAL: The mbedtls context MUST be stack-allocated (not a pointer) for ESP32-S3 hardware SHA acceleration.
   // The ESP32-S3 DMA engine references this structure's memory addresses. If the context is passed to another
   // function (crossing stack frames) or if VLAs are present, the DMA operations will corrupt memory and produce
-<<<<<<< HEAD
-  // truncated/incorrect hash results. See s3_hardware_sha.md for details.
-=======
   // truncated/incorrect hash results.
->>>>>>> upstream/dev
   mbedtls_sha256_context ctx_{};
 #elif defined(USE_ESP8266) || defined(USE_RP2040)
   br_sha256_context ctx_{};