Fix merge errors

Author: julian-elastic

server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java

@@ -934,7 +934,6 @@ public boolean hasScriptValues() {
         public boolean hasNormalizer() {
             return normalizer != Lucene.KEYWORD_ANALYZER;
         }
-        }
 
         @Override
         public Query automatonQuery(
@@ -945,6 +944,7 @@ public Query automatonQuery(
             String description
         ) {
             return new AutomatonQueryWithDescription(new Term(name()), automatonSupplier.get(), description);
+        }
     }
 
     private final boolean indexed;

server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java

@@ -105,11 +105,11 @@ public WildcardQueryBuilder(StreamInput in) throws IOException {
         rewrite = in.readOptionalString();
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_10_0)) {
             caseInsensitive = in.readBoolean();
-        if (expressionTransportSupported(in.getTransportVersion())) {
-            forceStringMatch = in.readBoolean();
-        } else {
-            forceStringMatch = false;
-        }
+            if (expressionTransportSupported(in.getTransportVersion())) {
+                forceStringMatch = in.readBoolean();
+            } else {
+                forceStringMatch = false;
+            }
         }
     }
 

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanStreamWrapperQueryBuilder.java

@@ -20,8 +20,6 @@
 
 import java.io.IOException;
 
-import static org.elasticsearch.index.query.WildcardQueryBuilder.expressionTransportSupported;
-
 /**
  * A {@link QueryBuilder} that wraps another {@linkplain QueryBuilder}
  * so it read with a {@link PlanStreamInput}.

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java

@@ -85,7 +85,6 @@
 import org.elasticsearch.xpack.esql.plan.physical.ProjectExec;
 import org.elasticsearch.xpack.esql.plan.physical.TopNExec;
 import org.elasticsearch.xpack.esql.planner.FilterTests;
-import org.elasticsearch.xpack.esql.plugin.EsqlFlags;
 import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
 import org.elasticsearch.xpack.esql.querydsl.query.SingleValueQuery;
 import org.elasticsearch.xpack.esql.rule.Rule;
@@ -1879,7 +1878,6 @@ public void testToDateNanosPushDown() {
         assertThat(expected.toString(), is(esQuery.query().toString()));
     }
 
-
     private boolean isMultiTypeEsField(Expression e) {
         return e instanceof FieldAttribute fa && fa.field() instanceof MultiTypeEsField;
     }