Resolve merge conflicts

Author: baanders

articles/azure-maps/creator-indoor-maps.md

@@ -154,12 +154,7 @@ Example layer in the style.json file:
 
 The map configuration is an array of configurations. Each configuration consists of a [basemap][basemap] and one or more layers, each layer consisting of a [style][style] + [tileset][tileset] tuple.
 
-<!------------------------------  Option #1  --------------------------------------------------------------->
-The map configuration is used when you [Instantiate the Indoor Manager][instantiate-indoor-manager] of a Map object when developing  applications in Azure Maps. It's referenced using the `mapConfigurationId` or `alias`. Map configurations are immutable. Anytime you make a change and save it using the same `alias` as an existing map configuration, your existing map configuration, including the `mapConfigurationId`, is replaced with a new one. This will result in errors in code referencing that `mapConfigurationId` since the ID will no longer point to an existing map configuration. The alias is constant and can be used to reference your map configuration regardless of how many times the map configuration it points to has changed.
-
-<!------------------------------  Option #2  ---------------------------------------------------------------
-The map configuration is used when you [Instantiate the Indoor Manager][instantiate-indoor-manager] of a Map object when developing a map application. It's referenced using the `mapConfigurationId` or `alias`. Each time you change a map configuration, its ID changes but its alias remains the same. It is recommended to reference the map configuration by its alias in your applications.
------------------------------------------------------------------------------------------------------------->
+The map configuration is used when you [Instantiate the Indoor Manager][instantiate-indoor-manager] of a Map object when developing applications in Azure Maps. It's referenced using the `mapConfigurationId` or `alias`. Map configurations are immutable. When making changes to an existing map configuration, a new map configuration will be created, resulting in a different `mapConfingurationId`. Anytime you create a map configuration using an alias already used by an existing map configuration, it will always point to the new map configuration.
 
 Below is an example of a map configuration JSON showing the default configurations. See the table below for a description of each element of the file:
 

articles/azure-maps/how-to-create-custom-styles.md

@@ -123,7 +123,7 @@ Some important things to know about aliases:
 Once you have entered values into each required field, select the **Upload map configuration** button to save the style and map configuration data to your Creator resource.
 
 > [!TIP]
-> Make a note of the map configuration ID or alias values, they are needed when you [Instantiate the Indoor Manager][Instantiate the Indoor Manager] of a Map object when developing applications in Azure Maps.
+> Make a note of the map configuration `alias` value, it will be required when you [Instantiate the Indoor Manager][Instantiate the Indoor Manager] of a Map object when developing applications in Azure Maps.
 
 ## Custom categories
 

articles/azure-maps/tutorial-creator-indoor-maps.md

@@ -348,7 +348,7 @@ Once your tileset creation completes, you can get the `mapConfigurationId` using
 
 2. In the **Create New** window, select **HTTP Request**.
 
-3. Enter a **Request name** for the request, such as *GET mapCongigurationId from Tileset*.
+3. Enter a **Request name** for the request, such as *GET mapConfigurationId from Tileset*.
 
 4. Select the **GET** HTTP method.
 

articles/digital-twins/how-to-integrate-maps.md

@@ -5,7 +5,7 @@ titleSuffix: Azure Digital Twins
 description: Learn how to use Azure Functions to create a function that can use the twin graph and Azure Digital Twins notifications to update an Azure Maps indoor map.
 author: baanders
 ms.author: baanders # Microsoft employees only
-ms.date: 09/26/2022
+ms.date: 09/27/2022
 ms.topic: how-to
 ms.service: digital-twins