diff --git a/Cargo.lock b/Cargo.lock
index 6eae7e78..9a8492ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -99,7 +99,7 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "axum"
-version = "0.8.9"
+version = "0.8.10"
 dependencies = [
  "anyhow",
  "axum-core",
@@ -172,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "axum-extra"
-version = "0.12.6"
+version = "0.12.7"
 dependencies = [
  "axum",
  "axum-core",
@@ -215,7 +215,7 @@ dependencies = [
 
 [[package]]
 name = "axum-macros"
-version = "0.5.1"
+version = "0.5.2"
 dependencies = [
  "axum",
  "axum-extra",
diff --git a/axum-core/Cargo.toml b/axum-core/Cargo.toml
index f9f56a53..7f18fa9d 100644
--- a/axum-core/Cargo.toml
+++ b/axum-core/Cargo.toml
@@ -9,6 +9,7 @@ license = "MIT"
 name = "axum-core"
 readme = "README.md"
 repository = "https://github.com/tokio-rs/axum"
+<<<<<<< Updated upstream
 version = "0.5.6" # remember to bump the version that axum and axum-extra depend on
 
 [package.metadata.cargo_check_external_types]
@@ -27,6 +28,9 @@ ignored = ["tower-http"] # See __private_docs feature
 
 [package.metadata.docs.rs]
 all-features = true
+=======
+version = "0.5.6"
+>>>>>>> Stashed changes
 
 [features]
 tracing = ["dep:tracing"]
diff --git a/axum-extra/CHANGELOG.md b/axum-extra/CHANGELOG.md
index 675304a9..8bc8a67b 100644
--- a/axum-extra/CHANGELOG.md
+++ b/axum-extra/CHANGELOG.md
@@ -120,6 +120,12 @@ Released without changes to fix docs.rs build.
 
 # 0.10.0
 
+## [0.12.7](https://github.com/tokio-rs/axum/compare/axum-extra-v0.12.6...axum-extra-v0.12.7) - 2026-05-05
+
+### Other
+
+- updated the following local packages: axum-core, axum-macros, axum
+
 ## since rc.1
 
 <details>
diff --git a/axum-extra/Cargo.toml b/axum-extra/Cargo.toml
index 936da035..9c83d0e6 100644
--- a/axum-extra/Cargo.toml
+++ b/axum-extra/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 name = "axum-extra"
 readme = "README.md"
 repository = "https://github.com/tokio-rs/axum"
-version = "0.12.6"
+version = "0.12.7"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -111,8 +111,8 @@ tower-layer = "0.3"
 tower-service = "0.3"
 
 # optional dependencies
-axum = { path = "../axum", version = "0.8.9", default-features = false, optional = true }
-axum-macros = { path = "../axum-macros", version = "0.5.1", optional = true }
+axum = { path = "../axum", version = "0.8.10", default-features = false, optional = true }
+axum-macros = { path = "../axum-macros", version = "0.5.2", optional = true }
 cookie = { package = "cookie", version = "0.18.0", features = ["percent-encode"], optional = true }
 fastrand = { version = "2.1.0", optional = true }
 form_urlencoded = { version = "1.1.0", optional = true }
diff --git a/axum-macros/CHANGELOG.md b/axum-macros/CHANGELOG.md
index e60a5770..3ea49cf5 100644
--- a/axum-macros/CHANGELOG.md
+++ b/axum-macros/CHANGELOG.md
@@ -23,6 +23,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 *No changes since alpha.1*
 
+## [0.5.2](https://github.com/tokio-rs/axum/compare/axum-macros-v0.5.1...axum-macros-v0.5.2) - 2026-05-05
+
+### Added
+
+- add `#[diagnostic::on_unimplemented]` to `IntoResponse` and `IntoResponseParts` ([#3723](https://github.com/tokio-rs/axum/pull/3723))
+
+### Other
+
+- use a more recent nightly for axum-macros tests
+
 ## full changelog
 
 - **breaking:** Update code generation for axum-core 0.5.0
diff --git a/axum-macros/Cargo.toml b/axum-macros/Cargo.toml
index 0d4cc731..7f161d41 100644
--- a/axum-macros/Cargo.toml
+++ b/axum-macros/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 name = "axum-macros"
 readme = "README.md"
 repository = "https://github.com/tokio-rs/axum"
-version = "0.5.1" # remember to also bump the version that axum and axum-extra depends on
+version = "0.5.2"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/axum/CHANGELOG.md b/axum/CHANGELOG.md
index ec68f076..62287b6f 100644
--- a/axum/CHANGELOG.md
+++ b/axum/CHANGELOG.md
@@ -131,6 +131,18 @@ Yanked from crates.io due to unforeseen breaking change, see [#3190] for details
 
 # 0.8.0
 
+## [0.8.10](https://github.com/tokio-rs/axum/compare/axum-v0.8.9...axum-v0.8.10) - 2026-05-05
+
+### Added
+
+- impl IntoResponseParts for Redirect ([#3721](https://github.com/tokio-rs/axum/pull/3721))
+
+### Other
+
+- integrate release-plz ([#3739](https://github.com/tokio-rs/axum/pull/3739))
+- remove duplication between `IntoResponse` and `IntoResponseParts` for `Redirect` ([#3743](https://github.com/tokio-rs/axum/pull/3743))
+- Bump matchit to 0.9.2 ([#3702](https://github.com/tokio-rs/axum/pull/3702))
+
 ## since rc.1
 
 <details>
diff --git a/axum/Cargo.toml b/axum/Cargo.toml
index ed430d2e..20949928 100644
--- a/axum/Cargo.toml
+++ b/axum/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axum"
-version = "0.8.9" # remember to bump the version that axum-extra depends on
+version = "0.8.10"
 categories = ["asynchronous", "network-programming", "web-programming::http-server"]
 description = "HTTP routing and request handling library that focuses on ergonomics and modularity"
 edition = "2021"
@@ -104,8 +104,12 @@ __private = ["tokio", "http1", "dep:reqwest"]
 
 [dependencies]
 axum-core = { path = "../axum-core", version = "0.5.6" }
+<<<<<<< Updated upstream
 bytes = "1.7"
 futures-core = "0.3"
+=======
+bytes = "1.0"
+>>>>>>> Stashed changes
 futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
 http = "1.0.0"
 http-body = "1.0.0"
@@ -123,7 +127,7 @@ tower-layer = "0.3.2"
 tower-service = "0.3"
 
 # optional dependencies
-axum-macros = { path = "../axum-macros", version = "0.5.1", optional = true }
+axum-macros = { path = "../axum-macros", version = "0.5.2", optional = true }
 base64 = { version = "0.22.1", optional = true }
 form_urlencoded = { version = "1.1.0", optional = true }
 futures-sink = { version = "0.3", optional = true }