diff --git a/docs/reference/commandline/swarm_join.md b/docs/reference/commandline/swarm_join.md
index 1d1d782d2e..9a13430b46 100644
--- a/docs/reference/commandline/swarm_join.md
+++ b/docs/reference/commandline/swarm_join.md
@@ -88,7 +88,6 @@ This flag is generally not necessary when joining an existing swarm.
 ### `--manager`
 
 Joins the node as a manager
->>>>>>> 22565e1... Split advertised address from listen address
 
 ### `--token string`