Fix changelog

CHANGELOG.md

@@ -1,14 +1,5 @@
 # Changelog
 
-<<<<<<< HEAD
-## Cldr_Units v3.16.5
-
-This is the changelog for Cldr_units v3.16.4 released on April 11th, 2024.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_units/tags)
-
-### Bug Fixes
-
-* Fix spec for `Cldr.Unit.display_name/2`. Thanks to @ryotsu for the report. Closes #43.
-
 ## Cldr_Units v3.17.0
 
 This is the changelog for Cldr_units v3.17.0 released on April 21st, 2024.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_units/tags)
@@ -23,6 +14,14 @@ This is the changelog for Cldr_units v3.17.0 released on April 21st, 2024.  For
 
 * `Cldr.Unit.Math.mult/2` and `Cldr.Unit.Math.div/2` now support scalar values as the second argument. Its therefore now possible to say `Cldr.Unit.Math.mult(Cldr.Unit.new!(:meter, 10), 2)`.
 
+## Cldr_Units v3.16.5
+
+This is the changelog for Cldr_units v3.16.4 released on April 11th, 2024.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_units/tags)
+
+### Bug Fixes
+
+* Fix spec for `Cldr.Unit.display_name/2`. Thanks to @ryotsu for the report. Closes #43.
+
 ## Cldr_Units v3.16.4
 
 This is the changelog for Cldr_units v3.16.4 released on November 2nd, 2023.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_units/tags)