From 3a9efea988d4ba787194b6032d635a73edf89090 Mon Sep 17 00:00:00 2001
From: Richard Marmorstein <richardm@stripe.com>
Date: Mon, 4 Dec 2023 15:32:43 -0800
Subject: [PATCH] bad merge

---
 .../java/com/stripe/net/LiveStripeResponseGetter.java  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/main/java/com/stripe/net/LiveStripeResponseGetter.java b/src/main/java/com/stripe/net/LiveStripeResponseGetter.java
index 01de18c35d4..e480d9621a5 100644
--- a/src/main/java/com/stripe/net/LiveStripeResponseGetter.java
+++ b/src/main/java/com/stripe/net/LiveStripeResponseGetter.java
@@ -88,19 +88,11 @@ public InputStream requestStream(APIRequest apiRequest) throws StripeException {
         fullUrl(apiRequest.getBaseAddress(), apiRequest.getOptions(), apiRequest.getPath());
 
     StripeRequest request =
-<<<<<<< HEAD
-        new StripeRequest(method, fullUrl, params, RequestOptions.merge(this.options, options));
-||||||| parent of a9aca7bc7e (wip)
-        new StripeRequest(
-            method, fullUrl, params, RequestOptions.merge(this.options, options), this.usage);
-=======
         new StripeRequest(
             apiRequest.getMethod(),
             fullUrl,
             apiRequest.getParams(),
-            RequestOptions.merge(this.options, apiRequest.getOptions()),
-            this.usage);
->>>>>>> a9aca7bc7e (wip)
+            RequestOptions.merge(this.options, apiRequest.getOptions()));
     StripeResponseStream responseStream = httpClient.requestStreamWithRetries(request);
 
     int responseCode = responseStream.code();