fix merge artifacts

Author: tamram

includes/azure-cli-prepare-your-environment-no-header.md

@@ -11,13 +11,9 @@ ms.note: This include file is used by over 460 articles. Check with ms.author be
 
 - Use the Bash environment in [Azure Cloud Shell](../articles/cloud-shell/quickstart.md). For more information, see [Azure Cloud Shell Quickstart - Bash](../articles/cloud-shell/quickstart.md).
    [![Launch Cloud Shell in a new window](media/cloud-shell-try-it/hdi-launch-cloud-shell.png)](https://shell.azure.com)
-<<<<<<< HEAD
-- For local Azure CLI, see how to [install the Azure CLI](/cli/azure/install-azure-cli). If you're running on Windows or macOS, consider running Azure CLI in a Docker container. For more information, see [How to run the Azure CLI in a Docker container](/cli/azure/run-azure-cli-docker).
-=======
 - If you prefer to run CLI reference commands locally, [install](/cli/azure/install-azure-cli) the Azure CLI. If you're running on Windows or macOS, consider running Azure CLI in a Docker container. For more information, see [How to run the Azure CLI in a Docker container](/cli/azure/run-azure-cli-docker).
 
   - If you're using a local installation, sign in to the Azure CLI by using the [az login](/cli/azure/reference-index#az-login) command. To finish the authentication process, follow the steps displayed in your terminal. For other sign-in options, see [Sign in with the Azure CLI](/cli/azure/authenticate-azure-cli).
->>>>>>> e7d3c3725e0a3fd3fd6cfbfebc7ee644432fc291
 
   - When you're prompted, install the Azure CLI extension on first use. For more information about extensions, see [Use extensions with the Azure CLI](/cli/azure/azure-cli-extensions-overview).