diff --git a/docs/calls/livekit.mdx b/docs/calls/livekit.mdx
index 4415f9e8f..4c25a1117 100644
--- a/docs/calls/livekit.mdx
+++ b/docs/calls/livekit.mdx
@@ -211,7 +211,11 @@ ### Integration with an external TURN server
 
 Generate a long random secret for LiveKit, and add it to your coturn config under the `static-auth-secret` option. You can add as many secrets as you want, so set a different one for each thing using your TURN server.
 
+<<<<<<< HEAD
 Then configure LiveKit, making sure to replace `COTURN_SECRET` with the ones you generated:
+=======
+Then configure livekit, making sure to replace `COTURN_SECRET` with the ones you generated:
+>>>>>>> a462db2 (docs: replace personal links and small fixes in docs for Livekit TURN)
 
 ```yaml
 # livekit.yaml