doc: pending revisions from PR-4753 (devtron-labs#4754)

* Added Enterprise Tag to Custom Profile Section

* Simplified actual links to relative links

* Other fixes and typos

* CO Revision Incorporated

* CO Revision 2

* Revision 3

* Revision 4

docs/reference/glossary.md

@@ -192,11 +192,7 @@ In Devtron, you can configure pre-build actions by going to Applications (choose
 
 Actions or processes performed after the [image](#image) building process in a containerized application's deployment pipeline, e.g., email notification about build status.
 
-<<<<<<< HEAD
 In Devtron, you can configure post-build actions by going to Applications (choose your app) → App Configuration (tab) → Workflow Editor → (edit build pipeline) → Post-build stage (tab) → Add task (button). [Read More...](../user-guide/creating-application/workflow/ci-build-pre-post-plugins.md#configuring-pre-post-build-tasks)
-=======
-In Devtron, you can configure post-build actions by going to Applications (choose your app) → App Configuration (tab) → Workflow Editor → (edit build pipeline) → Post-build stage (tab) → Add task (button). [Read More...](../user-guide/creating-application/workflow/ci-build-pre-post-plugins#configuring-pre-post-build-tasks)
->>>>>>> 4ad25dbcc (doc: project-level corrections (#4753))
 
 ### Pre-deployment
 
@@ -256,4 +252,3 @@ In Devtron, you can choose the target platform by going to Applications (choose
 
 
 
-

docs/setup/getting-started/getting-started.md

@@ -27,11 +27,7 @@ You can create a cluster using one of the following cloud providers as per your
 | **AWS EKS** | Create a cluster using [AWS EKS](https://docs.aws.amazon.com/eks/latest/userguide/getting-started-console.html). <br>`Note`: You can also refer our customized documentation for installing  `Devtron with CI/CD` on AWS EKS [here](https://github.com/devtron-labs/devtron/blob/b33a37bb608d07966c8f8b89e4f59287db873c6c/docs/setup/install/install-devtron-on-aws-eks.md).</br>  |
 | **Google Kubernetes Engine (GKE)** | Create a cluster using [GKE](https://cloud.google.com/kubernetes-engine/). |
 | **Azure Kubernetes Service (AKS)** | Create a cluster using [AKS](https://learn.microsoft.com/en-us/azure/aks/). | 
-<<<<<<< HEAD
 | **k3s - Lightweight Kubernetes** | Create a cluster using [k3s - Lightweight Kubernetes](https://devtron.ai/blog/deploy-your-applications-over-k3s-lightweight-kubernetes-in-no-time/).<br>`Note`: You can also refer our customized documentation for installing `Helm Dashboard by Devtron` on `Minikube, Microk8s, K3s, Kind` [here](../install/Install-devtron-on-Minikube-Microk8s-K3s-Kind.md).</br> | 
-=======
-| **k3s - Lightweight Kubernetes** | Create a cluster using [k3s - Lightweight Kubernetes](https://devtron.ai/blog/deploy-your-applications-over-k3s-lightweight-kubernetes-in-no-time/).<br>`Note`: You can also refer our customized documentation for installing `Helm Dashboard by Devtron` on `Minikube, Microk8s, K3s, Kind` [here](../install/install-devtron-on-minikube-microk8s-k3s-kind.md).</br> | 
->>>>>>> 4ad25dbcc (doc: project-level corrections (#4753))
 
 
 
@@ -81,4 +77,3 @@ Choose one of the options as per your requirements:
 
 **Note**: If you have questions, please let us know on our discord channel. [![Join Discord](https://img.shields.io/badge/Join%20us%20on-Discord-e01563.svg)](https://discord.gg/jsRG5qx2gp)
 
-

docs/user-guide/creating-application/deployment-template.md

@@ -47,9 +47,5 @@ Enable **show application metrics** toggle to view the application metrics on th
 Select **Save & Next** to save your configurations.
 
 {% hint style="warning" %}
-<<<<<<< HEAD
 Super-admins can lock keys in base deployment template to prevent non-super-admins from modifying those locked keys. Refer [Lock Deployment Configuration](../global-configurations/lock-deployment-config.md) to know more.
-=======
-Super-admins can lock keys in base deployment template to prevent non-super-admins from modifying those locked keys. Refer [Lock Deployment Config](../global-configurations/lock-deployment-config.md) to know more.
->>>>>>> 4ad25dbcc (doc: project-level corrections (#4753))
-{% endhint %}
+{% endhint %}