chore: fix conflict

CHANGELOG.md

-
 <a name="v1.13.2"></a>
 ## [v1.13.2] - 2022-12-23
 
@@ -156,8 +155,12 @@
 <a name="v1.0.0"></a>
 ## v1.0.0 - 2022-10-04
 
+<<<<<<< HEAD
 [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