Update changelog

CHANGELOG.md

+
+<a name="v1.15.0"></a>
+## [v1.15.0] - 2023-03-09
+
+<a name="v1.14.0"></a>
+## [v1.14.0] - 2023-03-09
+
 <a name="v1.13.2"></a>
 ## [v1.13.2] - 2022-12-23
 
@@ -155,12 +162,10 @@
 <a name="v1.0.0"></a>
 ## v1.0.0 - 2022-10-04
 
-<<<<<<< HEAD
+[v1.15.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.14.0...v1.15.0
+[v1.14.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.13.2...v1.14.0
 [v1.13.2]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.13.1...v1.13.2
 [v1.13.1]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.13.0...v1.13.1
-=======
-[v1.14.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.13.0...v1.14.0
->>>>>>> d4109b1 (Update changelog)
 [v1.13.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.12.0...v1.13.0
 [v1.12.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.11.0...v1.12.0
 [v1.11.0]: https://gitlab.schukai.com/oss/libraries/go/application/xflags/compare/v1.10.2...v1.11.0