diff --git a/docs/v1-redeploy-changelog.md b/docs/v1-redeploy-changelog.md
index ff41367..bbc1021 100644
--- a/docs/v1-redeploy-changelog.md
+++ b/docs/v1-redeploy-changelog.md
@@ -119,7 +119,6 @@
 - **Juju spaces are per-model.** `juju spaces` / `juju reload-spaces` cannot run until after
   `juju add-model`; the old phase-01 CHECK 5 ran pre-model and failed with "model not found".
   Split into `juju-spaces-check.sh`, gated to run post-add-model.
-<<<<<<< HEAD
 
 - **Default-space globally poisons network-get (deploy root cause).** The full D-052
   binding deploy failed universally (`network-get ... ERROR space "metal" not found`,
@@ -192,5 +191,3 @@
 - Pending next artifact: the Strategy-B interface-carve script (built once all four are Ready;
   bridge_type pulled verbatim from captured release JSON) -> then consolidate into
   `runbooks/phase-00b-host-reenrollment.md`.
-=======
->>>>>>> b67a7082af31ddead1249b487b6c94098dd290bc