fix merge conflicts

Author: Max Hniebergall

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/openai/OpenAiUnifiedChatCompletionRequestEntity.java

@@ -37,8 +37,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
         builder.field(MODEL_FIELD, model.getServiceSettings().modelId());
 
-        if (Strings.isNullOrEmpty(modelFields.user()) == false) {
-            builder.field(USER_FIELD, modelFields.user());
+        if (Strings.isNullOrEmpty(model.getTaskSettings().user()) == false) {
+            builder.field(USER_FIELD, model.getTaskSettings().user());
         }
 
         builder.endObject();

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/completion/ElasticInferenceServiceCompletionModel.java

@@ -17,7 +17,6 @@
 import org.elasticsearch.inference.TaskSettings;
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.inference.UnifiedCompletionRequest;
-import org.elasticsearch.xpack.inference.external.request.openai.OpenAiUnifiedChatCompletionRequest;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceComponents;
@@ -28,21 +27,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-public class ElasticInferenceServiceCompletionModel extends ElasticInferenceServiceModel {
-
-    public static ElasticInferenceServiceCompletionModel of(
-        ElasticInferenceServiceCompletionModel model,
-        UnifiedCompletionRequest request
-    ) {
-import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
-import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceComponents;
-import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceModel;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.Objects;
-
 public class ElasticInferenceServiceCompletionModel extends ElasticInferenceServiceModel {
 
     public static ElasticInferenceServiceCompletionModel of(