diff --git a/components/engine/docs/sources/reference/commandline/cli.rst b/components/engine/docs/sources/reference/commandline/cli.rst
index 07789cf4bd..b00d5c0b95 100644
--- a/components/engine/docs/sources/reference/commandline/cli.rst
+++ b/components/engine/docs/sources/reference/commandline/cli.rst
@@ -969,7 +969,9 @@ 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: