edk2 : Fix merge conflict and changelog (#15701)

Co-authored-by: Kanishk Bansal <kanbansal@microsoft.com>

Author: Kanishk-Bansal

SPECS/edk2/edk2.spec

@@ -819,12 +819,6 @@ done
 * Mon Aug 11 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-9
 - Patch for CVE-2025-3770
 
-* Fri Oct 03 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-10
-- Patch for CVE-2025-9230
-
-* Mon Aug 11 2025 Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> - 20240524git3e722403cd16-9
-- Patch for CVE-2025-3770
-
 * Thu Apr 24 2025 Jyoti Kanase <v-jykanase@microsoft.com> - 20240524git3e722403cd16-8
 - Fix CVE-2024-38796