Fix incorrect file merge

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

@@ -348,14 +348,14 @@ public enum Cap {
         DATE_DIFF_YEAR_CALENDARIAL,
 
         /**
-         * Allow filter per individual aggregation.
+         * Support named parameters for field names.
          */
-        PER_AGG_FILTERING;
+        NAMED_PARAMETER_FOR_FIELD_AND_FUNCTION_NAMES,
 
         /**
-         * Support named parameters for field names.
+         * Allow filter per individual aggregation.
          */
-        NAMED_PARAMETER_FOR_FIELD_AND_FUNCTION_NAMES;
+        PER_AGG_FILTERING;
 
         private final boolean snapshotOnly;
         private final FeatureFlag featureFlag;