diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57d47bfcd..526a56987 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,18 +7,9 @@ All notable changes to Bambuddy will be documented in this file.
 ### New Features
 - **Home Assistant Notification Provider** ([#656](https://github.com/maziggy/bambuddy/issues/656)) — Added Home Assistant as a notification provider. When HA is configured in Settings → Network → Home Assistant, selecting "Home Assistant" as a notification provider sends persistent notifications to the HA dashboard — no additional configuration needed. From there, HA automations can forward notifications to mobile apps, WhatsApp, or any other service. Requested by @TravisWilder.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 ### Fixed
 - **Debug Logging Endpoint 500 Error** — The `GET /api/v1/support/debug-logging` endpoint returned a 500 Internal Server Error when the database contained a timezone-aware timestamp written by a previous version. The duration calculation subtracted a timezone-aware datetime from a naive `datetime.now()`, raising `TypeError`. Now strips timezone info when reading the stored timestamp.
 
-=======
->>>>>>> aab695c (  Add Home Assistant as notification provider (#656))
-=======
-### Fixed
-- **Debug Logging Endpoint 500 Error** — The `GET /api/v1/support/debug-logging` endpoint returned a 500 Internal Server Error when the database contained a timezone-aware timestamp written by a previous version. The duration calculation subtracted a timezone-aware datetime from a naive `datetime.now()`, raising `TypeError`. Now strips timezone info when reading the stored timestamp.
-
->>>>>>> 63ca668 (  Fix debug logging endpoint 500 error after version upgrade)
 
 ## [0.2.2b3] - Unreleased
 
diff --git a/backend/app/api/routes/support.py b/backend/app/api/routes/support.py
index 3fad23fec..9d7682e06 100644
--- a/backend/app/api/routes/support.py
+++ b/backend/app/api/routes/support.py
@@ -62,22 +62,9 @@ async def _get_debug_setting(db: AsyncSession) -> tuple[bool, datetime | None]:
     enabled_at = None
     if enabled_at_setting and enabled_at_setting.value:
         try:
-<<<<<<< HEAD
-<<<<<<< HEAD
-            enabled_at = datetime.fromisoformat(enabled_at_setting.value).replace(tzinfo=None)
-=======
             enabled_at = datetime.fromisoformat(enabled_at_setting.value)
             if enabled_at.tzinfo is None:
                 enabled_at = enabled_at.replace(tzinfo=timezone.utc)
->>>>>>> 63208cf (  Fix debug logging banner showing negative timer duration)
-=======
-            enabled_at = datetime.fromisoformat(enabled_at_setting.value)
-            if enabled_at.tzinfo is None:
-                enabled_at = enabled_at.replace(tzinfo=timezone.utc)
-=======
-            enabled_at = datetime.fromisoformat(enabled_at_setting.value).replace(tzinfo=None)
->>>>>>> 253828c (  Fix debug logging endpoint 500 error after version upgrade)
->>>>>>> 63ca668 (  Fix debug logging endpoint 500 error after version upgrade)
         except ValueError:
             pass  # Ignore malformed timestamp; enabled_at stays None