diff --git a/capa/v26.0.0/announcement.md b/capa/v26.0.0/announcement.md
index 18c81b171..b6a9a0c52 100644
--- a/capa/v26.0.0/announcement.md
+++ b/capa/v26.0.0/announcement.md
@@ -1,4 +1,8 @@
 **Workload cluster release v26.0.0 for CAPA is available**. This release upgrades Kubernetes version to v26.
 
+<<<<<<< HEAD
 Further details can be found in the [release notes](https://docs.giantswarm.io/changes/workload-cluster-releases-capa/releases/aws-26.0.0/).
+=======
+Further details can be found in the [release notes](https://docs.giantswarm.io/changes/workload-cluster-releases-aws/releases/aws-26.0.0/).
+>>>>>>> a43c81d (Add AWS (CAPA) v26.0.0 release (#1280))