issue 673 change log modiications

CHANGELOG.md

@@ -3,16 +3,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
-<<<<<<< HEAD
-## [1.16.0]
-
-* [!1.16.0](https://repo1.dso.mil/platform-one/big-bang/bigbang/-/merge_requests?scope=all&utf8=%E2%9C%93&state=merged&milestone_title=1.16.0); List of merge requests in this release.
-=======
 
-## [1.15.3]
+## [1.16.0]
 
-- [!673]() Add CA cer secret for sso.
->>>>>>> d00f5ef0 (issue 673 bigbang sso secrets)
+- # [!1.16.0](https://repo1.dso.mil/platform-one/big-bang/bigbang/-/merge_requests?scope=all&utf8=%E2%9C%93&state=merged&milestone_title=1.16.0); List of merge requests in this release.
 
 ## [1.15.2]