diff --git a/docs/sources/reference/commandline/cli.rst b/docs/sources/reference/commandline/cli.rst
index b00d5c0b95..07789cf4bd 100644
--- a/docs/sources/reference/commandline/cli.rst
+++ b/docs/sources/reference/commandline/cli.rst
@@ -969,9 +969,7 @@ The last container is marked as a ``Ghost`` container. It is a container that wa
 
     Pull an image or a repository from the registry
 
-<<<<<<< HEAD
       -t, --tag="": Download tagged image in repository
->>>>>>> b47d9c5... Adding CLI options to the commandline reference documentation.
 
 
 .. _cli_push: