Fix conflicts

Signed-off-by: Craig Perkins <[email protected]>

Author: cwperks

sample-resource-plugin/src/main/java/org/opensearch/sample/SampleResourcePlugin.java

@@ -123,6 +123,7 @@ public List<RestHandler> getRestHandlers(
         handlers.add(new GetResourceGroupRestAction());
         handlers.add(new DeleteResourceGroupRestAction());
         handlers.add(new SearchResourceGroupRestAction());
+
         handlers.add(new SecurePluginRestAction());
         return handlers;
     }