diff --git a/.github/bundles/eks/uds-bundle.yaml b/.github/bundles/eks/uds-bundle.yaml
index 749446375..ba010c513 100644
--- a/.github/bundles/eks/uds-bundle.yaml
+++ b/.github/bundles/eks/uds-bundle.yaml
@@ -6,7 +6,11 @@ metadata:
   name: uds-core-eks-nightly
   description: A UDS bundle for deploying EKS and UDS Core
   # x-release-please-start-version
+<<<<<<< HEAD:.github/bundles/eks/uds-bundle.yaml
   version: "0.29.0"
+=======
+  version: "0.28.0"
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795)):.github/bundles/uds-bundle.yaml
   # x-release-please-end
 
 packages:
@@ -17,7 +21,11 @@ packages:
   - name: core
     path: ../../../build
     # x-release-please-start-version
+<<<<<<< HEAD:.github/bundles/eks/uds-bundle.yaml
     ref: 0.29.0
+=======
+    ref: 0.28.0
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795)):.github/bundles/uds-bundle.yaml
     # x-release-please-end
     optionalComponents:
       - metrics-server
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 88d34f8c0..130edc2c5 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,7 @@
 {
+<<<<<<< HEAD
     ".": "0.29.0"
+=======
+    ".": "0.28.0"
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1478fe0b0..fe1db1bc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
+<<<<<<< HEAD
 ## [0.29.0](https://github.com/defenseunicorns/uds-core/compare/v0.28.0...v0.29.0) (2024-10-11)
 
 
@@ -55,6 +56,8 @@ All notable changes to this project will be documented in this file.
 * regroup 'support dependencies' in renovate config ([#885](https://github.com/defenseunicorns/uds-core/issues/885)) ([640d859](https://github.com/defenseunicorns/uds-core/commit/640d859a50de6c7d49afec3283fac2a249d04dd7))
 * update license ([#878](https://github.com/defenseunicorns/uds-core/issues/878)) ([b086170](https://github.com/defenseunicorns/uds-core/commit/b086170f415c82916a6e493517ac5bc62b2b7aea))
 
+=======
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
 ## [0.28.0](https://github.com/defenseunicorns/uds-core/compare/v0.27.3...v0.28.0) (2024-09-27)
 
 
diff --git a/README.md b/README.md
index 2a822ad61..1498ce643 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,11 @@ If you want to try out UDS Core, you can use the [k3d-core-demo bundle](./bundle
 <!-- x-release-please-start-version -->
 
 ```bash
+<<<<<<< HEAD
 uds deploy k3d-core-demo:0.29.0
+=======
+uds deploy k3d-core-demo:0.28.0
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
 ```
 
 <!-- x-release-please-end -->
@@ -70,7 +74,11 @@ Deploy Istio, Keycloak and Pepr:
 <!-- x-release-please-start-version -->
 
 ```bash
+<<<<<<< HEAD
 uds deploy k3d-core-slim-dev:0.29.0
+=======
+uds deploy k3d-core-slim-dev:0.28.0
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
 ```
 
 <!-- x-release-please-end -->
diff --git a/bundles/k3d-slim-dev/uds-bundle.yaml b/bundles/k3d-slim-dev/uds-bundle.yaml
index 0e4b28ea9..b1859b7c7 100644
--- a/bundles/k3d-slim-dev/uds-bundle.yaml
+++ b/bundles/k3d-slim-dev/uds-bundle.yaml
@@ -6,7 +6,11 @@ metadata:
   name: k3d-core-slim-dev
   description: A UDS bundle for deploying Istio from UDS Core on a development cluster
   # x-release-please-start-version
+<<<<<<< HEAD
   version: "0.29.0"
+=======
+  version: "0.28.0"
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
   # x-release-please-end
 
 packages:
@@ -37,7 +41,11 @@ packages:
   - name: core-base
     path: ../../build/
     # x-release-please-start-version
+<<<<<<< HEAD
     ref: 0.29.0
+=======
+    ref: 0.28.0
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
     # x-release-please-end
     overrides:
       istio-admin-gateway:
diff --git a/bundles/k3d-standard/uds-bundle.yaml b/bundles/k3d-standard/uds-bundle.yaml
index f0e9c2bab..7f7b4c40d 100644
--- a/bundles/k3d-standard/uds-bundle.yaml
+++ b/bundles/k3d-standard/uds-bundle.yaml
@@ -6,7 +6,11 @@ metadata:
   name: k3d-core-demo
   description: A UDS bundle for deploying the standard UDS Core package on a development cluster
   # x-release-please-start-version
+<<<<<<< HEAD
   version: "0.29.0"
+=======
+  version: "0.28.0"
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
   # x-release-please-end
 
 packages:
@@ -37,7 +41,11 @@ packages:
   - name: core
     path: ../../build/
     # x-release-please-start-version
+<<<<<<< HEAD
     ref: 0.29.0
+=======
+    ref: 0.28.0
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
     # x-release-please-end
     optionalComponents:
       - istio-passthrough-gateway
diff --git a/packages/base/zarf.yaml b/packages/base/zarf.yaml
index 254120929..c0c2430ee 100644
--- a/packages/base/zarf.yaml
+++ b/packages/base/zarf.yaml
@@ -7,7 +7,11 @@ metadata:
   description: "UDS Core (Base)"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
+<<<<<<< HEAD:packages/base/zarf.yaml
   version: "0.29.0"
+=======
+  version: "0.28.0"
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795)):packages/slim-dev/zarf.yaml
   # x-release-please-end
   x-uds-dependencies: []
 
diff --git a/packages/standard/zarf.yaml b/packages/standard/zarf.yaml
index a1f2cb03e..e458b11a7 100644
--- a/packages/standard/zarf.yaml
+++ b/packages/standard/zarf.yaml
@@ -7,7 +7,11 @@ metadata:
   description: "UDS Core"
   authors: "Defense Unicorns - Product"
   # x-release-please-start-version
+<<<<<<< HEAD
   version: "0.29.0"
+=======
+  version: "0.28.0"
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
   # x-release-please-end
 
 components:
diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml
index 09325a263..6afb448d1 100644
--- a/tasks/deploy.yaml
+++ b/tasks/deploy.yaml
@@ -9,7 +9,11 @@ variables:
   - name: VERSION
     description: "The version of the packages to deploy"
     # x-release-please-start-version
+<<<<<<< HEAD
     default: "0.29.0"
+=======
+    default: "0.28.0"
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
     # x-release-please-end
   - name: FLAVOR
     default: upstream
diff --git a/tasks/publish.yaml b/tasks/publish.yaml
index 4a523a95d..d80afd36e 100644
--- a/tasks/publish.yaml
+++ b/tasks/publish.yaml
@@ -14,7 +14,11 @@ variables:
   - name: VERSION
     description: "The version of the packages to build"
     # x-release-please-start-version
+<<<<<<< HEAD
     default: "0.29.0"
+=======
+    default: "0.28.0"
+>>>>>>> 62baad3 (chore(main): release 0.28.0 (#795))
     # x-release-please-end
 
   - name: LAYER