Resolving merge conflicts

CHANGELOG.md

@@ -2,12 +2,39 @@
 
 # UNRELEASED
 
+* EXOManagementScope
+  * Initial Release.
+* AADPasswordRuleSettings
+  * Initial release
+* IntuneAntivirusPolicyWindows10SettingCatalog
+  * Fixes an issue with invalid parameter definition.
+    FIXES [#5015](https://github.com/microsoft/Microsoft365DSC/issues/5015)
+* SentinelSetting
+  * Initial release.
+* SPOAccessControlSettings
+  * Added support for property EnableRestrictedAccessControl.
+* DEPENDENCIES
+  * Added dependencies on Az.Accounts, Az.Resources and Az.SecurityInsights
+  * Updated MSCloudLoginAssistant to version 1.1.22.
+
+# 1.24.904.1
+
+* EXOOwaMailboxPolicy
+  * Add support for AccountTransferEnabled parameter
 * EXOSweepRule
   * Initial Release.
+* FabricAdminTenantSettings
+  * Initial Release.
+* IntuneDeviceControlPolicyWindows10
+  * Initial Release
 * M365DSCDRGUtil
   * Fixes an issue where a Intune settings catalog DSC param was not handled
     correctly when it was not specified.
     FIXES [#5000](https://github.com/microsoft/Microsoft365DSC/issues/5000)
+  * Fixes an issue where the exported nested CIM instances had too many line breaks.
+  * Fixes an issue where Settings Catalog properties were not correctly handled.
+* DEPENDENCIES
+  * Updated MSCloudLoginAssistant to version 1.1.20.
 
 # 1.24.828.1
 
@@ -67,8 +94,6 @@
 * M365DSCUtil
   * Fix `Compare-PSCustomObjectArrays` by allowing empty arrays as input
     FIXES [#4952](https://github.com/microsoft/Microsoft365DSC/issues/4952)
-* O365OrgSettings
-  * FIXES [#4741](https://github.com/microsoft/Microsoft365DSC/issues/4741)
 * MISC
   * Improve module updates and PowerShell Core support across the DSC
     resources.