diff --git a/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs
index b32ff11f8f0c..9ec4ff52bc56 100644
--- a/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs
@@ -55,15 +55,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/payments.rs b/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/payments.rs
index 3b31b7be4b7b..343d0d0cd2ac 100644
--- a/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/payments.rs
+++ b/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/payments.rs
@@ -48,18 +48,11 @@ pub trait Payments<E: std::fmt::Debug + Send + Sync + 'static = ()>:
     /// GetPaymentMethodById - GET /v71/paymentMethods/{id}
     async fn get_payment_method_by_id(
         &self,
-<<<<<<< HEAD
         method: &Method,
         host: &Host,
         cookies: &CookieJar,
+        claims: &Self::Claims,
         path_params: &models::GetPaymentMethodByIdPathParams,
-=======
-        method: Method,
-        host: Host,
-        cookies: CookieJar,
-        claims: Self::Claims,
-        path_params: models::GetPaymentMethodByIdPathParams,
->>>>>>> ba70bfea1e1 (Implement basic and bearer auth handling)
     ) -> Result<GetPaymentMethodByIdResponse, E>;
 
     /// Get payment methods.
@@ -67,16 +60,10 @@ pub trait Payments<E: std::fmt::Debug + Send + Sync + 'static = ()>:
     /// GetPaymentMethods - GET /v71/paymentMethods
     async fn get_payment_methods(
         &self,
-<<<<<<< HEAD
         method: &Method,
         host: &Host,
         cookies: &CookieJar,
-=======
-        method: Method,
-        host: Host,
-        cookies: CookieJar,
-        claims: Self::Claims,
->>>>>>> ba70bfea1e1 (Implement basic and bearer auth handling)
+        claims: &Self::Claims,
     ) -> Result<GetPaymentMethodsResponse, E>;
 
     /// Make a payment.
diff --git a/samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs b/samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs
index 1b9c031774aa..7eff68149076 100644
--- a/samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs
+++ b/samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs
@@ -92,25 +92,7 @@ where
 
     let result = api_impl
         .as_ref()
-<<<<<<< HEAD
-<<<<<<< HEAD
-        .get_payment_method_by_id(&method, &host, &cookies, &path_params)
-=======
-<<<<<<< HEAD
-        .get_payment_method_by_id(method.clone(), host.clone(), cookies.clone(), path_params)
-=======
-        .get_payment_method_by_id(method, host, cookies, claims, path_params)
->>>>>>> 99ae104c473 (Implement basic and bearer auth handling)
->>>>>>> ba70bfea1e1 (Implement basic and bearer auth handling)
-=======
-        .get_payment_method_by_id(
-            method.clone(),
-            host.clone(),
-            cookies.clone(),
-            claims,
-            path_params,
-        )
->>>>>>> ae676ae13c0 (Rebase with updated error handler)
+        .get_payment_method_by_id(&method, &host, &cookies, &claims, &path_params)
         .await;
 
     let mut response = Response::builder();
@@ -226,19 +208,7 @@ where
 
     let result = api_impl
         .as_ref()
-<<<<<<< HEAD
-<<<<<<< HEAD
-        .get_payment_methods(&method, &host, &cookies)
-=======
-<<<<<<< HEAD
-        .get_payment_methods(method.clone(), host.clone(), cookies.clone())
-=======
-        .get_payment_methods(method, host, cookies, claims)
->>>>>>> 99ae104c473 (Implement basic and bearer auth handling)
->>>>>>> ba70bfea1e1 (Implement basic and bearer auth handling)
-=======
-        .get_payment_methods(method.clone(), host.clone(), cookies.clone(), claims)
->>>>>>> ae676ae13c0 (Rebase with updated error handler)
+        .get_payment_methods(&method, &host, &cookies, &claims)
         .await;
 
     let mut response = Response::builder();
diff --git a/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/mod.rs
index 7383364d9cdd..752f538755dd 100644
--- a/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/mod.rs
@@ -7,15 +7,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/mod.rs
index 21e6114cabf1..4a7d1c8a6009 100644
--- a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/mod.rs
@@ -9,15 +9,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/ops-v3/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/ops-v3/src/apis/mod.rs
index 7383364d9cdd..752f538755dd 100644
--- a/samples/server/petstore/rust-axum/output/ops-v3/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/ops-v3/src/apis/mod.rs
@@ -7,15 +7,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake.rs
index 9da4e061e94b..564eb1085851 100644
--- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake.rs
+++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake.rs
@@ -208,18 +208,11 @@ pub trait Fake<E: std::fmt::Debug + Send + Sync + 'static = ()>: super::ErrorHan
     /// TestEndpointParameters - POST /v2/fake
     async fn test_endpoint_parameters(
         &self,
-<<<<<<< HEAD
         method: &Method,
         host: &Host,
         cookies: &CookieJar,
+        claims: &Self::Claims,
         body: &models::TestEndpointParametersRequest,
-=======
-        method: Method,
-        host: Host,
-        cookies: CookieJar,
-        claims: Self::Claims,
-        body: models::TestEndpointParametersRequest,
->>>>>>> ba70bfea1e1 (Implement basic and bearer auth handling)
     ) -> Result<TestEndpointParametersResponse, E>;
 
     /// To test enum parameters.
diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/mod.rs
index 3c359fb7b8fc..9a4b4e6db197 100644
--- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/mod.rs
@@ -47,15 +47,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
index 54728e711ffb..b65d06f5b241 100644
--- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
+++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
@@ -47,17 +47,8 @@ where
             put(test_body_with_query_params::<I, A, E, C>),
         )
         .route(
-<<<<<<< HEAD
-<<<<<<< HEAD
             "/v2/fake/hyphenParam/{hyphen_param}",
-            get(hyphen_param::<I, A, E>),
-=======
-            "/v2/fake/hyphenParam/:hyphen_param",
-=======
-            "/v2/fake/hyphenParam/{hyphen_param}",
->>>>>>> 51f6e61839d (Fix capture group syntax)
             get(hyphen_param::<I, A, E, C>),
->>>>>>> ba70bfea1e1 (Implement basic and bearer auth handling)
         )
         .route(
             "/v2/fake/inline-additionalProperties",
@@ -1025,19 +1016,7 @@ where
 
     let result = api_impl
         .as_ref()
-<<<<<<< HEAD
-<<<<<<< HEAD
-        .test_endpoint_parameters(&method, &host, &cookies, &body)
-=======
-<<<<<<< HEAD
-        .test_endpoint_parameters(method.clone(), host.clone(), cookies.clone(), body)
-=======
-        .test_endpoint_parameters(method, host, cookies, claims, body)
->>>>>>> 99ae104c473 (Implement basic and bearer auth handling)
->>>>>>> ba70bfea1e1 (Implement basic and bearer auth handling)
-=======
-        .test_endpoint_parameters(method.clone(), host.clone(), cookies.clone(), claims, body)
->>>>>>> ae676ae13c0 (Rebase with updated error handler)
+        .test_endpoint_parameters(&method, &host, &cookies, &claims, &body)
         .await;
 
     let mut response = Response::builder();
diff --git a/samples/server/petstore/rust-axum/output/petstore/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/petstore/src/apis/mod.rs
index 002f40e08ba4..6de5b387ecc0 100644
--- a/samples/server/petstore/rust-axum/output/petstore/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/petstore/src/apis/mod.rs
@@ -22,15 +22,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/default.rs b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/default.rs
index b74f69d10758..bac58e388aaa 100644
--- a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/default.rs
+++ b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/default.rs
@@ -24,15 +24,9 @@ pub trait Default<E: std::fmt::Debug + Send + Sync + 'static = ()>: super::Error
     /// PingGet - GET /ping
     async fn ping_get(
         &self,
-<<<<<<< HEAD
         method: &Method,
         host: &Host,
         cookies: &CookieJar,
-=======
-        method: Method,
-        host: Host,
-        cookies: CookieJar,
-        claims: Self::Claims,
->>>>>>> ba70bfea1e1 (Implement basic and bearer auth handling)
+        claims: &Self::Claims,
     ) -> Result<PingGetResponse, E>;
 }
diff --git a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/mod.rs
index afb8cf2e3d3f..19d2acdf7be1 100644
--- a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/mod.rs
@@ -29,15 +29,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/server/mod.rs b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/server/mod.rs
index 256de1934e41..41412e84997d 100644
--- a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/server/mod.rs
+++ b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/server/mod.rs
@@ -73,14 +73,10 @@ where
             .map_err(|_| StatusCode::BAD_REQUEST);
     };
 
-<<<<<<< HEAD
-    let result = api_impl.as_ref().ping_get(&method, &host, &cookies).await;
-=======
     let result = api_impl
         .as_ref()
-        .ping_get(method.clone(), host.clone(), cookies.clone(), claims)
+        .ping_get(&method, &host, &cookies, &claims)
         .await;
->>>>>>> ba70bfea1e1 (Implement basic and bearer auth handling)
 
     let mut response = Response::builder();
 
diff --git a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/mod.rs
index 7383364d9cdd..752f538755dd 100644
--- a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/mod.rs
@@ -7,15 +7,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/mod.rs
index 7383364d9cdd..752f538755dd 100644
--- a/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/mod.rs
@@ -7,15 +7,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/mod.rs
index 7383364d9cdd..752f538755dd 100644
--- a/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/mod.rs
@@ -7,15 +7,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);
diff --git a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/mod.rs
index 7383364d9cdd..752f538755dd 100644
--- a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/mod.rs
+++ b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/mod.rs
@@ -7,15 +7,9 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     #[tracing::instrument(skip_all)]
     async fn handle_error(
         &self,
-<<<<<<< HEAD
         method: &::http::Method,
         host: &axum_extra::extract::Host,
         cookies: &axum_extra::extract::CookieJar,
-=======
-        method: ::http::Method,
-        host: axum_extra::extract::Host,
-        cookies: axum_extra::extract::CookieJar,
->>>>>>> ff8e3cd38e6 (Update deps)
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {
         tracing::error!("Unhandled error: {:?}", error);