Merge pull request #14645 from hashicorp/docs/hot-fix-1-11release

fix merge conflict markings

website/content/docs/intro/index.mdx

@@ -7,17 +7,7 @@ description: >-
 
 # What is Consul?
 
-<<<<<<< HEAD
-Welcome to the intro guide to Consul! This guide is the best place to start
-with Consul. We cover what Consul is, what problems it can solve, how it compares
-to existing software, and how you can get started using it. If you are familiar
-with the basics of Consul, the [documentation](/docs) provides a more
-detailed reference of available features. If you're ready to get hands-on
-experience, deploy Consul locally with our
-[HashiCorp Learn tutorial](https://learn.hashicorp.com/tutorials/consul/get-started-install).
-=======
 HashiCorp Consul is a service networking solution that enables teams to manage secure network connectivity between services and across on-prem and multi-cloud environments and runtimes. Consul offers service discovery, service mesh, traffic management, and automated updates to network infrastructure device. You can use these features individually or together in a single Consul deployment.
->>>>>>> 843d9cdaae (Merge pull request #14603 from hashicorp/docs/what-is-consul-devdot-update)
 
 > **Hands-on**: Complete the Getting Started tutorials to learn how to deploy Consul:
 - [Get Started on Kubernetes](https://learn.hashicorp.com/collections/consul/gs-consul-service-mesh)