diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
index c8b869d504e..2d0d0743caf 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
@@ -32,18 +32,13 @@ public class RetryingOAuthTest {
 
     @Before
     public void setUp() throws Exception {
-<<<<<<< HEAD
-        oauth = new RetryingOAuth("_clientId", "_clientSecret", OAuthFlow.ACCESS_CODE,
-                "https://token.example.com", Collections.<String, String>emptyMap());
-=======
         oauth =
                 new RetryingOAuth(
                         "_clientId",
                         "_clientSecret",
-                        OAuthFlow.accessCode,
+                        OAuthFlow.ACCESS_CODE,
                         "https://token.example.com",
                         Collections.<String, String>emptyMap());
->>>>>>> 5.4.x
         oauth.setAccessToken("expired-access-token");
         FieldUtils.writeField(oauth, "oAuthClient", mockOAuthClient(), true);
     }