fix ChangeLog.md (#27006)

Author: YanaXu

src/Automation/Automation/ChangeLog.md

@@ -18,12 +18,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-<<<<<<< HEAD
+* Fixed Bug: Start-AzAutomationRunbook throws object reference error when the automation account is not available in the subscription 
 
 ## Version 1.11.0
-=======
-* Fixed Bug: Start-AzAutomationRunbook throws object reference error when the automation account is not available in the subscription 
->>>>>>> origin/main
 * Upgraded nuget package to signed package.
 
 ## Version 1.10.0

src/Compute/Compute/ChangeLog.md

@@ -20,13 +20,13 @@
 
 -->
 ## Upcoming Release
+* Added new parameter `EncryptionIdentity` to cmdlet `Set-AzVMDiskEncryptionExtension`
+* Added new parameter `EncryptionIdentity` to cmdlet `New-AzVMConfig`
 
 ## Version 9.0.1
 * Upgraded nuget package to signed package.
 * Upgraded Azure.Core to 1.44.1.
 * Compute gallery related cmdlets will now use 2024-03-03 GalleryRP API calls. 
-* Added new parameter `EncryptionIdentity` to cmdlet `Set-AzVMDiskEncryptionExtension`
-* Added new parameter `EncryptionIdentity` to cmdlet `New-AzVMConfig`
 
 ## Version 9.0.0
 * Made `-PublicIpSku` parameter Standard by default in `New-AzVM`