fixing conflicts in text

Author: georgewallace

serverless/pages/welcome-to-serverless.asciidoc

@@ -1,6 +1,5 @@
 preview:[]
 
-<<<<<<< HEAD
 {serverless-full} is a fully managed solution that allows you to deploy and use Elastic for your use cases without managing the underlying infrastructure. It represents a shift in how you interact with {es} - instead of managing clusters, nodes, data tiers, and scaling, you create **serverless projects** that are fully managed and automatically scaled by Elastic. This abstraction of infrastructure decisions allows you to focus solely on gaining value and insight from your data.
 
 {serverless-full} automatically provisions, manages, and scales your {es} resources based on your actual usage. Unlike traditional deployments where you need to predict and provision resources in advance, serverless adapts to your workload in real-time, ensuring optimal performance while eliminating the need for manual capacity planning.
@@ -10,27 +9,12 @@ decouples compute and storage. Search and indexing operations are separated, whi
 a high level of performance.
 
 // For more information see https://www.elastic.co/blog/elastic-serverless-architecture[our blog post].
-=======
-Elastic serverless products allow you to deploy and use Elastic for your use cases without managing the underlying Elastic cluster,
-such as nodes, data tiers, and scaling. Serverless instances of the Elastic Stack that you create in {ecloud} are called **serverless projects**. These serverless projects are fully-managed, autoscaled, and automatically upgraded by Elastic so you can focus more on gaining value and insight from your data.
-
-Serverless instances of the Elastic Stack that you create in {ecloud} are called **serverless projects**.
-
-Serverless projects use the core components of the {stack}, such as {es} and {kib}, and are based on https://www.elastic.co/blog/elastic-serverless-architecture[an architecture that
-decouples compute and storage]. Search and indexing operations are separated, which offers high flexibility for scaling your workloads while ensuring
-a high level of performance.
->>>>>>> c52057e (fixing merge conflicts)
 
 Elastic provides three serverless solutions available on {ecloud}:
 
 * **https://www.elastic.co/guide/en/serverless/current/what-is-elasticsearch-serverless.html[{es}]**: Build powerful applications and search experiences using a rich ecosystem of vector search capabilities, APIs, and libraries.
 * **https://www.elastic.co/guide/en/serverless/current/what-is-observability-serverless.html[{observability}]**: Monitor your own platforms and services using powerful machine learning and analytics tools with your logs, metrics, traces, and APM data.
 * **https://www.elastic.co/guide/en/serverless/current/what-is-security-serverless.html[{elastic-sec}]**: Detect, investigate, and respond to threats with SIEM, endpoint protection, and AI-powered analytics capabilities.
-<<<<<<< HEAD
-
-Elastic serverless products are currently in preview. 
-=======
->>>>>>> c52057e (fixing merge conflicts)
 
 // https://www.elastic.co/blog/elastic-serverless-architecture[Learn more about serverless in our blog].