fix conflict

xinyual · xinyual · commit 93eb5b3fdbff · 2025-10-20T15:59:11.000+08:00
Signed-off-by: xinyual &lt;xinyual@amazon.com&gt;
diff --git a/ppl/src/main/antlr/OpenSearchPPLParser.g4 b/ppl/src/main/antlr/OpenSearchPPLParser.g4
@@ -83,11 +83,8 @@ commands
    | regexCommand
    | timechartCommand
    | rexCommand
-<<<<<<< HEAD
    | appendPipeCommand
-=======
    | replaceCommand
->>>>>>> origin/main
    ;
 
 commandName
