resolve markers

Author: laujan

articles/ai-services/document-intelligence/studio-overview.md

@@ -27,28 +27,16 @@ The studio is an online tool to visually explore, understand, train, and integra
 * Train custom extraction models to extract fields from documents.
 * Get sample code for the language specific `SDKs` to integrate into your applications.
 
-<<<<<<< HEAD
- All the features from the Document Intelligence are available in [Document Intelligence Studio](https://documentintelligence.ai.azure.com/studio) 
-
-## Choosing the correct studio experience
-
-The [Document Intelligence Studio](https://documentintelligence.ai.azure.com/studio) is for building and validating  Document Intelligence models.  All of our [prebuilt models](overview.md#prebuilt-models) and [general extraction models](overview.md#general-extraction-models) are available on DI studios.
-=======
 Currently, we're undergoing the migration of features from the [Document Intelligence Studio](https://documentintelligence.ai.azure.com/studio) to the new [AI Foundry](https://ai.azure.com/explore/aiservices/vision). There are some differences in the offerings for the two studios, which determine the correct studio for your use case.
 
 ## Choosing the correct studio experience
 
 There are currently two studios, the [Azure AI Foundry](https://ai.azure.com/explore/aiservices/vision) and the [Document Intelligence Studio](https://documentintelligence.ai.azure.com/studio) for building and validating  Document Intelligence models. As the experiences migrate to the new AI Foundry, some experiences are available in both studios, while other experiences/models are only available in only one of the studios. To follow are a few guidelines for choosing the Studio experience for your needs. All of our [prebuilt models](overview.md#prebuilt-models) and [general extraction models](overview.md#general-extraction-models) are available on both studios.
->>>>>>> 8d3a5a2960fcdacf82352de6cb8335c99450711e
 
 ### When to use [Document Intelligence Studio](https://documentintelligence.ai.azure.com/studio)
 
 Document Intelligence Studio contains all features released on or before November 2024. For any of the v2.1, v3.0, v3.1 features, continue to use the Document Intelligence Studio. Studios provide a visual experience for labeling, training, and validating custom models. For custom document field extraction models, use the Document Intelligence Studio for template and neural models. Custom classification models can only be trained and used on Document Intelligence Studio. Use Document Intelligence Studio if you want to try out GA versions of the models from version v3.0, v3.1, and v4.0.
 
-<<<<<<< HEAD
-
-## Prerequisites for using Document Intelligence Studio
-=======
 ### When to use [AI Foundry](https://ai.azure.com/explore/aiservices/vision)
 
 Start with the new Azure AI Foundry and try any of the prebuilt document models from `2024-02-29-preview` version including general extraction models like Read or Layout. If you want to build and test a new [Document Field Extraction](https://ai.azure.com/explore/aiservices/vision/document/extraction) model, try our generative AI model, only available in the new AI Foundry.
@@ -58,7 +46,6 @@ Start with the new Azure AI Foundry and try any of the prebuilt document models
 Select the studio experience from the following tabs to learn more about each studio and how you can get started.
 
 ### [**Document Intelligence Studio**](#tab/di-studio)
->>>>>>> 8d3a5a2960fcdacf82352de6cb8335c99450711e
 
 > [!IMPORTANT]
 >