Resolve merge conflicts

FaithOmbongi · FaithOmbongi · commit 0afed1e750f5 · 2022-03-01T20:46:57.000+03:00
diff --git a/api-reference/beta/resources/enums.md b/api-reference/beta/resources/enums.md
@@ -155,13 +155,14 @@ Namespace: microsoft.graph
 
 ### appCredentialRestrictionType values
 
-|Member|
-|:-----|
-|passwordAddition|
-|passwordLifetime|
-|symmetricKeyAddition|
-|symmetricKeyLifetime|
-|unknownFutureValue|
+| Member                 |
+| :--------------------- |
+| passwordAddition       |
+| passwordLifetime       |
+| symmetricKeyAddition   |
+| symmetricKeyLifetime   |
+| customPasswordAddition |
+| unknownFutureValue     |
 
 ### appKeyCredentialRestrictionType values
 
diff --git a/changelog/Microsoft.DirectoryServices.json b/changelog/Microsoft.DirectoryServices.json
@@ -1,5 +1,23 @@
 {
   "changelog": [
+    {
+      "ChangeList": [
+        {
+          "Id": "5db23135-2470-428b-98ab-dd33f3c8a5cf",
+          "ApiChange": "Member",
+          "ChangedApiName": "customPasswordAddition",
+          "ChangeType": "Addition",
+          "Description": "Added the `customPasswordAddition` member to the **appCredentialRestrictionType** enumeration. Use this new restriction for the [application authentication methods policy](https://docs.microsoft.com/en-us/graph/api/resources/applicationauthenticationmethodpolicy?view=graph-rest-beta) to restrict all new custom (non-Azure AD generated) password secrets on applications or service principals.",
+          "Target": "appCredentialRestrictionType"
+        }
+      ],
+      "Id": "5db23135-2470-428b-98ab-dd33f3c8a5cf",
+      "Cloud": "Prod",
+      "Version": "beta",
+      "CreatedDateTime": "2022-03-01T00:00:00.0123959Z",
+      "WorkloadArea": "Applications",
+      "SubArea": ""
+    },
     {
       "ChangeList": [
         {
