Merge branch '4.x' into 5.x

# Conflicts:
#	CHANGELOG.md

Author: angrybrad

CHANGELOG.md

@@ -40,8 +40,10 @@
 - Cart numbers are now generated using a cryptographically secure random number generator.
 - Cart controller actions that accept an explicit cart number are now rate limited to mitigate enumeration attacks.
 - Fixed a PHP error that could occur when using the manual gateway. ([#4245](https://github.com/craftcms/commerce/pull/4245))
-- Fixed [high-severity](https://github.com/craftcms/cms/security/policy#severity--remediation) SQL injection vulnerabilities. (GHSA-875v-7m49-8x88)
-- Fixed a [low-severity](https://github.com/craftcms/cms/security/policy#severity--remediation) information disclosure vulnerability. (GHSA-3vxg-x5f8-f5qf)
+- Fixed [high-severity](https://github.com/craftcms/cms/security/policy#severity--remediation) SQL injection vulnerabilities. ([GHSA-875v-7m49-8x88](https://github.com/craftcms/commerce/security/advisories/GHSA-875v-7m49-8x88))
+- Fixed a [low-severity](https://github.com/craftcms/cms/security/policy#severity--remediation) information disclosure vulnerability. ([GHSA-3vxg-x5f8-f5qf](https://github.com/craftcms/commerce/security/advisories/GHSA-3vxg-x5f8-f5qf))
+
+>>>>>>> 4.x
 
 ## 5.5.4 - 2026-02-18