Fix more merge conflicts

Author: brianrourkeboll

docs/release-notes/.FSharp.Core/10.0.100.md

@@ -7,5 +7,6 @@
 ### Changed
 
 * Random functions support for zero element chosen/sampled ([PR #18568](https://github.com/dotnet/fsharp/pull/18568))
+* Enable more `string` optimizations by adding `when 'T : Enum` library-only library-only static optimization constraint. ([PR #18546](https://github.com/dotnet/fsharp/pull/18546))
 
-### Breaking Changes
+* ### Breaking Changes