docs: fix typo in 06-grpc_rest.md (#19192)

(cherry picked from commit 96ecafd)

# Conflicts:
#	docs/docs/core/06-grpc_rest.md

docs/docs/core/06-grpc_rest.md

@@ -89,7 +89,11 @@ Some CometBFT RPC endpoints are directly related to the Cosmos SDK:
     * `/store/{path}`: this will query the store directly.
     * `/p2p/filter/addr/{port}`: this will return a filtered list of the node's P2P peers by address port.
     * `/p2p/filter/id/{id}`: this will return a filtered list of the node's P2P peers by ID.
+<<<<<<< HEAD:docs/docs/core/06-grpc_rest.md
 * `/broadcast_tx_{aync,async,commit}`: these 3 endpoint will broadcast a transaction to other peers. CLI, gRPC and REST expose [a way to broadcast transations](./01-transactions.md#broadcasting-the-transaction), but they all use these 3 CometBFT RPCs under the hood.
+=======
+* `/broadcast_tx_{sync,async,commit}`: these 3 endpoints will broadcast a transaction to other peers. CLI, gRPC and REST expose [a way to broadcast transactions](./01-transactions.md#broadcasting-the-transaction), but they all use these 3 CometBFT RPCs under the hood.
+>>>>>>> 96ecafd0b (docs: fix typo in 06-grpc_rest.md (#19192)):docs/learn/advanced/06-grpc_rest.md
 
 ## Comparison Table