fix: merge conflict

Author: TomerAberbach

openai-java-core/src/main/kotlin/com/openai/services/async/ModelServiceAsyncImpl.kt

@@ -76,7 +76,7 @@ class ModelServiceAsyncImpl internal constructor(private val clientOptions: Clie
                     .method(HttpMethod.GET)
                     .addPathSegments("models", params._pathParam(0))
                     .build()
-                    .prepareAsync(clientOptions, params, params.model())
+                    .prepareAsync(clientOptions, params, params.model().get())
             val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions))
             return request
                 .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) }
@@ -146,7 +146,7 @@ class ModelServiceAsyncImpl internal constructor(private val clientOptions: Clie
                     .addPathSegments("models", params._pathParam(0))
                     .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } }
                     .build()
-                    .prepareAsync(clientOptions, params, params.model())
+                    .prepareAsync(clientOptions, params, params.model().get())
             val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions))
             return request
                 .thenComposeAsync { clientOptions.httpClient.executeAsync(it, requestOptions) }

openai-java-core/src/main/kotlin/com/openai/services/blocking/ModelServiceImpl.kt

@@ -66,7 +66,7 @@ class ModelServiceImpl internal constructor(private val clientOptions: ClientOpt
                     .method(HttpMethod.GET)
                     .addPathSegments("models", params._pathParam(0))
                     .build()
-                    .prepare(clientOptions, params, params.model())
+                    .prepare(clientOptions, params, params.model().get())
             val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions))
             val response = clientOptions.httpClient.execute(request, requestOptions)
             return response.parseable {
@@ -130,7 +130,7 @@ class ModelServiceImpl internal constructor(private val clientOptions: ClientOpt
                     .addPathSegments("models", params._pathParam(0))
                     .apply { params._body().ifPresent { body(json(clientOptions.jsonMapper, it)) } }
                     .build()
-                    .prepare(clientOptions, params, params.model())
+                    .prepare(clientOptions, params, params.model().get())
             val requestOptions = requestOptions.applyDefaults(RequestOptions.from(clientOptions))
             val response = clientOptions.httpClient.execute(request, requestOptions)
             return response.parseable {