This is an automated cherry-pick of pingcap#6055

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ticdc/ticdc-open-protocol.md

@@ -273,8 +273,13 @@ COMMIT;
 
 Currently, TiCDC does not provide the standard parsing library for TiCDC Open Protocol, but the Golang version and Java version of parsing demonstrations are provided. You can refer to the data format provided in this document and the following demonstrations to implement the protocol parsing for consumers.
 
+<<<<<<< HEAD
 - [Golang demo](https://github.com/pingcap/ticdc/tree/release-5.0/kafka_consumer)
 - [Java demo](https://github.com/pingcap/ticdc/tree/release-5.0/demo/java)
+=======
+- [Golang demo](https://github.com/pingcap/ticdc/tree/master/cmd/kafka-consumer)
+- [Java demo](https://github.com/pingcap/ticdc/tree/master/demo/java)
+>>>>>>> c92e1a24b (TiCDC: update a golang demo link (#6055))
 
 ## Column type code