Merge pull request #7205 from jesp209i/main

Flexible Environments - clarify link to Merge Conflicts article

Author: eshanrnh

umbraco-cloud/getting-started/flexible-environments.md

@@ -32,6 +32,8 @@ This feature enables:
 
 Learn more about the deployment process in the [Deployments](../deployment/) section.
 
+Learn more about handling merge Conflicts in Flexible Environments in the [Troubleshooting](../troubleshooting/deployments/merge-conflicts-on-flexible-environments.md) section.
+
 ## Project Prerequisites
 
 Before you can add a Flexible environment to your project, the following prerequisites must be met:
@@ -43,7 +45,6 @@ Before you can add a Flexible environment to your project, the following prerequ
 
 * Only one flexible environment is available.
 * Flexible environments are available only for projects paid with credit cards or credits.
-* CI/CD Pipelines are not supported.
 * Flexible Environments are not available for Heartcore projects.
 
 ## Plans and Availability

umbraco-cloud/troubleshooting/deployments/README.md

@@ -24,3 +24,7 @@ The most common Content [Transfer](../../deployment/content-transfer.md)/[Restor
 * [SQL Timeouts](https://docs.umbraco.com/umbraco-deploy/deploy-settings#timeout-settings).
 * [Dependency Exception](dependency-exceptions.md).
 * [Media path too long](path-too-long-exception.md).
+
+With the introduction of Flexible Environments, the chance of getting merge conflicts on Umbraco Cloud has increased. Read more about what to do in case of merge conflicts and how to avoid them. 
+
+* [Merge Conflicts on Flexible Environments](./merge-conflicts-on-flexible-environments.md)