modify based on comments

Signed-off-by: Ruirui Zhang <[email protected]>

server/src/main/java/org/opensearch/action/ActionModule.java

@@ -369,7 +369,6 @@
 import org.opensearch.rest.action.admin.cluster.RestPendingClusterTasksAction;
 import org.opensearch.rest.action.admin.cluster.RestPutRepositoryAction;
 import org.opensearch.rest.action.admin.cluster.RestPutStoredScriptAction;
-import org.opensearch.rest.action.admin.cluster.RestQueryGroupStatsAction;
 import org.opensearch.rest.action.admin.cluster.RestReloadSecureSettingsAction;
 import org.opensearch.rest.action.admin.cluster.RestRemoteClusterInfoAction;
 import org.opensearch.rest.action.admin.cluster.RestRemoteStoreStatsAction;
@@ -615,11 +614,8 @@ public <Request extends ActionRequest, Response extends ActionResponse> void reg
         actions.register(NodesInfoAction.INSTANCE, TransportNodesInfoAction.class);
         actions.register(RemoteInfoAction.INSTANCE, TransportRemoteInfoAction.class);
         actions.register(NodesStatsAction.INSTANCE, TransportNodesStatsAction.class);
-<<<<<<< HEAD
         actions.register(WlmStatsAction.INSTANCE, TransportWlmStatsAction.class);
-=======
-        actions.register(QueryGroupStatsAction.INSTANCE, TransportQueryGroupStatsAction.class);
->>>>>>> 986882eb641 (changelog)
+        actions.register(WlmStatsAction.INSTANCE, TransportWlmStatsAction.class);
         actions.register(RemoteStoreStatsAction.INSTANCE, TransportRemoteStoreStatsAction.class);
         actions.register(NodesUsageAction.INSTANCE, TransportNodesUsageAction.class);
         actions.register(NodesHotThreadsAction.INSTANCE, TransportNodesHotThreadsAction.class);
@@ -821,11 +817,8 @@ public void initRestHandlers(Supplier<DiscoveryNodes> nodesInCluster) {
         registerHandler.accept(new RestClearVotingConfigExclusionsAction());
         registerHandler.accept(new RestMainAction());
         registerHandler.accept(new RestNodesInfoAction(settingsFilter));
-<<<<<<< HEAD
         registerHandler.accept(new RestWlmStatsAction());
-=======
-        registerHandler.accept(new RestQueryGroupStatsAction());
->>>>>>> 986882eb641 (changelog)
+        registerHandler.accept(new RestWlmStatsAction());
         registerHandler.accept(new RestRemoteClusterInfoAction());
         registerHandler.accept(new RestNodesStatsAction());
         registerHandler.accept(new RestNodesUsageAction());