Resolve merge conflict

Author: FaithOmbongi

.openpublishing.redirection.json

@@ -271,4 +271,4 @@
             "redirect_document_id": false
         }
     ]
-}
+}

api-reference/beta/api/application-post-federatedidentitycredentials.md

@@ -44,9 +44,9 @@ The following table lists the properties that are required when you create the [
 
 |Property|Type|Description|
 |:---|:---|:---|
-|audiences|String collection|The audience that can appear in the external token. This field is mandatory and should be set to `api://AzureADTokenExchange` for Microsoft Entra ID. It says what Microsoft identity platform should accept in the `aud` claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you may need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters. Required.|
-|issuer|String|TThe URL of the external identity provider and must match the issuer claim of the external token being exchanged. The combination of the values of **issuer** and **subject** must be unique on the app. It has a limit of 600 characters. Required.|
-|name|String|The unique identifier for the federated identity credential, which has a limit of 120 characters and must be URL friendly. It is immutable once created|
+|audiences|String collection|Required. The audience that can appear in the external token. This field is mandatory and should be set to `api://AzureADTokenExchange` for Microsoft Entra ID. It says what Microsoft identity platform should accept in the `aud` claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you may need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters.|
+|issuer|String|Required. The URL of the external identity provider and must match the issuer claim of the external token being exchanged. The combination of the values of **issuer** and **subject** must be unique on the app. It has a limit of 600 characters.|
+|name|String|Required. The unique identifier for the federated identity credential, which has a limit of 120 characters and must be URL friendly. It is immutable once created.|
 |subject|String|Required. The identifier of the external software workload within the external identity provider. Like the audience value, it has no fixed format, as each identity provider uses their own - sometimes a GUID, sometimes a colon delimited identifier, sometimes arbitrary strings. The value here must match the sub claim within the token presented to Microsoft Entra ID. It has a limit of 600 characters. The combination of **issuer** and **subject** must be unique on the app.|
 
 

api-reference/beta/api/applicationtemplate-instantiate.md

@@ -49,6 +49,7 @@ In the request body, provide a JSON object with the following parameters.
 | Parameter    | Type        | Description |
 |:-------------|:------------|:------------|
 |displayName|String|Custom name of the application|
+|serviceManagementReference|String|The service tree ID for this service. Optional.|
 
 ## Response
 
@@ -60,7 +61,7 @@ The following example shows how to call this API.
 
 ### Request
 
-The following example shows a request. The request URL specifies `8adf8e6e-67b2-4cf2-a259-e3dc5476c621` as the application template ID. This means the request is instantiating a non-gallery app.
+The following example shows a request. The request URL specifies `8adf8e6e-67b2-4cf2-a259-e3dc5476c621` as the application template ID, which means that the request is instantiating a non-gallery app.
 
 # [HTTP](#tab/http)
 <!-- {

api-reference/beta/api/backuprestoreroot-enable.md

@@ -16,8 +16,6 @@ Namespace: microsoft.graph
 
 Enable the [Microsoft 365 Backup Storage](../resources/backuprestoreroot.md) service for a tenant.
 
-Before you call this API, call [List protection policies](../api/backuprestoreroot-list-protectionpolicies.md) to initialize the data store in the tenant. Data store initialization takes about 5 minutes. If you call this API before the data store is initialized, the call results in an error.
-
 [!INCLUDE [national-cloud-support](../../includes/global-only.md)]
 
 ## Permissions

api-reference/beta/api/businessscenarioplanner-delete-tasks.md

@@ -39,6 +39,7 @@ DELETE /solutions/businessScenarios/{businessScenarioId}/planner/tasks/{business
 |Name|Description|
 |:---|:---|
 |Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
+| If-Match  | Last known ETag value for the **businessScenarioTask** to be updated. Required.|
 
 ## Request body
 
@@ -63,6 +64,7 @@ The following example shows a request.
 -->
 ``` http
 DELETE https://graph.microsoft.com/beta/solutions/businessScenarios/c5d514e6c6864911ac46c720affb6e4d/planner/tasks/pmc1rS1Io0C3rXQhyXIsNmUAOeIi
+If-Match: W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAWCc="
 ```
 
 # [C#](#tab/csharp)

api-reference/beta/api/businessscenariotask-update.md

@@ -40,6 +40,7 @@ PATCH /solutions/businessScenarios/{businessScenarioId}/planner/tasks/{businessS
 |:---|:---|
 |Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
 |Content-Type|application/json. Required.|
+| If-Match  | Last known ETag value for the **businessScenarioTask** to be updated. Required.|
 
 ## Request body
 
@@ -82,6 +83,7 @@ The following example shows a request.
 ``` http
 PATCH https://graph.microsoft.com/beta/solutions/businessScenarios/c5d514e6c6864911ac46c720affb6e4d/planner/tasks/pmc1rS1Io0C3rXQhyXIsNmUAOeIi
 Content-Type: application/json
+If-Match: W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAWCc="
 
 {
   "title": "Customer order #12010",

api-reference/beta/api/channel-getallretainedmessages.md

@@ -1,6 +1,6 @@
 ---
 title: "channel: getAllRetainedMessages"
-description: "Get retained messages across all channels in a team."
+description: "Get all retained messages across all channels in a team."
 author: "AgnesLiu"
 ms.localizationpriority: medium
 ms.subservice: "teams"
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
 
 [!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
 
-Get retained [messages](../resources/chatmessage.md) across all [channels](../resources/channel.md) in a [team](../resources/team.md).
+Get all retained [messages](../resources/chatmessage.md) across all [channels](../resources/channel.md) in a [team](../resources/team.md).
 
 To learn more about how to use the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
 

api-reference/beta/api/channel-list-messages.md

@@ -52,8 +52,6 @@ This method supports the following [OData query parameters](/graph/query-paramet
 
 The other [OData query parameters](/graph/query-parameters) aren't currently supported.
 
-> **Note:** [GET /teams/{team-id}/channels/{channel-id}/messages/delta](chatmessage-delta.md) supports filtering by date, which provides similar data to    GET /teams/{team-id}/channels/{channel-id}/messages .
-
 ## Request headers
 
 | Header       | Value |

api-reference/beta/api/chat-getallretainedmessages.md

@@ -1,6 +1,6 @@
 ---
 title: "chat: getAllRetainedMessages"
-description: "Get retained messages from all chats that a user is a participant in, including one-on-one chats, group chats, and meeting chats."
+description: "Get all retained messages from all chats that a user is a participant in, including one-on-one chats, group chats, and meeting chats."
 author: "AgnesLiu"
 ms.localizationpriority: medium
 ms.subservice: "teams"
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
 
 [!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
 
-Get all retained messages from all [chats](../resources/chatmessage.md) that a user is a participant in, including one-on-one chats, group chats, and meeting chats.
+Get all retained [messages](../resources/chatmessage.md) from all [chats](../resources/chat.md) that a user is a participant in, including one-on-one chats, group chats, and meeting chats.
 
 To learn more about how to use the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
 
@@ -67,8 +67,8 @@ The following table lists examples that show how to use the `$filter` parameter.
 
 |Scenario                                  | `$filter` parameter                                                                       |Possible values                                                                                             |
 |:-----------------------------------------|:---------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------|
-|Get messages sent by user identity type   |$filter=from/user/userIdentityType eq '{teamworkUserIdentityType}'                      |aadUser, onPremiseAadUser, anonymousGuest, federatedUser, personalMicrosoftAccountUser, skypeUser, phoneUser|
-|Get messages sent by application type     |$filter=from/application/applicationIdentityType eq '{teamworkApplicationIdentity}'     |aadApplication, bot, tenantBot, office365Connector, outgoingWebhook                                         |
+|Get messages sent by user identity type   |$filter=from/user/userIdentityType eq '{teamworkUserIdentityType}'                      |`aadUser`, `onPremiseAadUser`, `anonymousGuest`, `federatedUser`, `personalMicrosoftAccountUser`, `skypeUser`, `phoneUser`|
+|Get messages sent by application type     |$filter=from/application/applicationIdentityType eq '{teamworkApplicationIdentity}'     |`aadApplication`, `bot`, `tenantBot`, `office365Connector`, `outgoingWebhook`                                         |
 |Get messages sent by user ID              |$filter=from/user/id eq '{oid}'                                                         ||
 |Get control (system event) messages       |$filter=messageType eq 'systemEventMessage'                                             ||
 |Exclude control (system event) messages   |$filter=messageType ne 'systemEventMessage'                                             ||