solve conflicts

Author: AnQi Fan🍅

.github/pull_request_template.md

@@ -1,17 +1,21 @@
-**Instructions:** _Add any supporting information, such as a description of the PR changes, here._
-
-
+> [!IMPORTANT]
+> Required for API changes:
+> - Link to API.md file: *ADD LINK HERE*
+> - Link to **PR** for public-facing schema changes (schema-Prod-beta/v1.0.csdl):  *ADD LINK HERE*
 
+---
+Add other supporting information, such as a description of the PR changes:
 
+*ADD INFORMATION HERE*
 
 ---
-> [!NOTE]
+> [!IMPORTANT]
 > The following guidance is for Microsoft employees only. Community contributors can ignore this message; our content team will manage the status.
 <details><summary><i>After you've created your PR</i>, expand this section for tips and additional instructions.</summary>
 
 
 - **do not merge** is the default PR status and is automatically added to all open PRs that don't have the **ready to merge** label.
-- Add the **ready for content review** label to start a review. Your PR won't be reviewed until you add this label.
+- Add the **ready for content review** label to start a review. Only PRs that have met the [minimum requirements for content review](https://dev.azure.com/msazure/One/_wiki/wikis/Microsoft%20Graph%20Partners/707655/Minimum-requirements-for-content-review) and have this label are reviewed.
 - If your content reviewer requests changes, review the feedback and address accordingly as soon as possible to keep your pull request moving forward. After you address the feedback, remove the **changes requested** label, add the **review feedback addressed** label, and select the **Re-request review** icon next to the content reviewer's alias. If you can't add labels, add a comment with `#feedback-addressed` to the pull request.
 - After the content review is complete, your reviewer will add the **content review complete** label. When the updates in this PR are ready for external customers to use, replace the **do not merge** label with **ready to merge** and the PR will be merged within 24 working hours.
 - Pull requests that are inactive for more than 6 weeks will be automatically closed. Before that, you receive reminders at 2 weeks, 4 weeks, and 6 weeks. If you still need the PR, you can reopen or recreate the request.

.openpublishing.publish.config.json

@@ -102,8 +102,8 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "api-reference/reusable-content",
-      "url": "https://github.com/MicrosoftDocs/reusable-content",
+      "path_to_root": "reusable-content",
+      "url": "https://github.com/MicrosoftDocs/reusable-content/",
       "branch": "main",
       "branch_mapping": {}
     }

api-reference/beta/api/accesspackage-delete-accesspackageresourcerolescopes.md

@@ -1,6 +1,6 @@
 ---
 title: "Remove resourceRoleScope from an access package"
-description: "Remove a resourceRoleScope from an access package."
+description: "Remove an accessPackageResourceRoleScope from an accessPackage list of resource role scopes."
 ms.localizationpriority: medium
 author: "markwahl-msft"
 ms.subservice: "entra-id-governance"
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
 
 [!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
 
-Remove a [accessPackageResourceRoleScope](../resources/accesspackageresourcerolescope.md) from an [accessPackage](../resources/accesspackage.md) list of resource role scopes.
+Remove an [accessPackageResourceRoleScope](../resources/accesspackageresourcerolescope.md) from an [accessPackage](../resources/accesspackage.md) list of resource role scopes.
 
 [!INCLUDE [national-cloud-support](../../includes/global-us.md)]
 
@@ -24,6 +24,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
 <!-- { "blockType": "permissions", "name": "accesspackage_delete_accesspackageresourcerolescopes" } -->
 [!INCLUDE [permissions-table](../includes/permissions/accesspackage-delete-accesspackageresourcerolescopes-permissions.md)]
 
+[!INCLUDE [rbac-entitlement-access-package-manager-write](../includes/rbac-for-apis/rbac-entitlement-management-access-package-manager-apis-write.md)]
+
 ## HTTP request
 
 <!-- { "blockType": "ignored" } -->

api-reference/beta/api/accesspackage-delete-incompatibleaccesspackage.md

@@ -24,6 +24,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
 <!-- { "blockType": "permissions", "name": "accesspackage_delete_incompatibleaccesspackage" } -->
 [!INCLUDE [permissions-table](../includes/permissions/accesspackage-delete-incompatibleaccesspackage-permissions.md)]
 
+[!INCLUDE [rbac-entitlement-access-package-manager-write](../includes/rbac-for-apis/rbac-entitlement-management-access-package-manager-apis-write.md)]
+
 ## HTTP request
 
 <!-- { "blockType": "ignored" } -->

api-reference/beta/api/accesspackage-delete-incompatiblegroup.md

@@ -24,6 +24,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
 <!-- { "blockType": "permissions", "name": "accesspackage_delete_incompatiblegroup" } -->
 [!INCLUDE [permissions-table](../includes/permissions/accesspackage-delete-incompatiblegroup-permissions.md)]
 
+[!INCLUDE [rbac-entitlement-access-package-manager-write](../includes/rbac-for-apis/rbac-entitlement-management-access-package-manager-apis-write.md)]
+
 ## HTTP request
 
 <!-- { "blockType": "ignored" } -->

api-reference/beta/api/accesspackage-filterbycurrentuser.md

@@ -12,6 +12,10 @@ Namespace: microsoft.graph
 
 [!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
 
+> [!CAUTION]
+> The **filterByCurrentUser** function is on a deprecation path and exists only to support current customers. We don't recommend using this function.
+
+
 In [Microsoft Entra Entitlement Management](../resources/entitlementmanagement-overview.md), retrieve a list of [accessPackage](../resources/accesspackage.md) objects filtered on the signed-in user.
 
 [!INCLUDE [national-cloud-support](../../includes/global-us.md)]

api-reference/beta/api/accesspackage-get.md

@@ -24,6 +24,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
 <!-- { "blockType": "permissions", "name": "accesspackage_get" } -->
 [!INCLUDE [permissions-table](../includes/permissions/accesspackage-get-permissions.md)]
 
+[!INCLUDE [rbac-entitlement-catalog-reader](../includes/rbac-for-apis/rbac-entitlement-management-catalog-reader-apis-read.md)]
+
 ## HTTP request
 
 <!-- { "blockType": "ignored" } -->

api-reference/beta/api/accesspackage-list-accesspackageresourcerolescopes.md

@@ -1,6 +1,6 @@
 ---
 title: "List accessPackageResourceRoleScopes"
-description: "Retrieve a list of accesspackageresourcerolescope objects."
+description: "Retrieve an access package with a list of accessPackageResourceRoleScope objects."
 ms.localizationpriority: medium
 author: "markwahl-msft"
 ms.subservice: "entra-id-governance"
@@ -24,6 +24,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
 <!-- { "blockType": "permissions", "name": "accesspackage_list_accesspackageresourcerolescopes" } -->
 [!INCLUDE [permissions-table](../includes/permissions/accesspackage-list-accesspackageresourcerolescopes-permissions.md)]
 
+[!INCLUDE [rbac-entitlement-catalog-reader](../includes/rbac-for-apis/rbac-entitlement-management-catalog-reader-apis-read.md)]
+
 ## HTTP request
 
 <!-- { "blockType": "ignored" } -->

api-reference/beta/api/accesspackage-list-accesspackagesincompatiblewith.md

@@ -24,6 +24,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
 <!-- { "blockType": "permissions", "name": "accesspackage_list_accesspackagesincompatiblewith" } -->
 [!INCLUDE [permissions-table](../includes/permissions/accesspackage-list-accesspackagesincompatiblewith-permissions.md)]
 
+[!INCLUDE [rbac-entitlement-catalog-reader](../includes/rbac-for-apis/rbac-entitlement-management-catalog-reader-apis-read.md)]
+
 ## HTTP request
 
 <!-- { "blockType": "ignored" } -->

api-reference/beta/api/accesspackage-list-incompatibleaccesspackages.md

@@ -24,6 +24,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
 <!-- { "blockType": "permissions", "name": "accesspackage_list_incompatibleaccesspackages" } -->
 [!INCLUDE [permissions-table](../includes/permissions/accesspackage-list-incompatibleaccesspackages-permissions.md)]
 
+[!INCLUDE [rbac-entitlement-catalog-reader](../includes/rbac-for-apis/rbac-entitlement-management-catalog-reader-apis-read.md)]
+
 ## HTTP request
 
 <!-- { "blockType": "ignored" } -->