fix(calling): resolving merge conflicts

CHANGELOG.md

@@ -2,6 +2,62 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.59.8](https://github.com/webex/webex-js-sdk/compare/v2.59.7...v2.59.8) (2023-11-16)
+
+
+### Bug Fixes
+
+* **services:** added hostCatalog inside webex ([#3198](https://github.com/webex/webex-js-sdk/issues/3198)) ([cdaddc2](https://github.com/webex/webex-js-sdk/commit/cdaddc2ffb9b66b6003cc9d3d19cd4ddd5d0cabf))
+
+### [2.59.7](https://github.com/webex/webex-js-sdk/compare/v2.59.6...v2.59.7) (2023-11-15)
+
+
+### Bug Fixes
+
+* **plugin-meetings:** start transcription when guest user is admitted ([#3195](https://github.com/webex/webex-js-sdk/issues/3195)) ([e4c31a0](https://github.com/webex/webex-js-sdk/commit/e4c31a082fa3ad0c3ad9930ede8ea0e854db0c65))
+
+### [2.59.6](https://github.com/webex/webex-js-sdk/compare/v2.59.5...v2.59.6) (2023-11-03)
+
+
+### Bug Fixes
+
+* **meetings:** pass encrypted title based on APPI API for conversation ([#3166](https://github.com/webex/webex-js-sdk/issues/3166)) ([080d786](https://github.com/webex/webex-js-sdk/commit/080d786626d98c18eb6c4abdb004c112811f0e12))
+
+### [2.59.5](https://github.com/webex/webex-js-sdk/compare/v2.59.4...v2.59.5) (2023-11-03)
+
+
+### Bug Fixes
+
+* **plugin-meetings:** cherry-picked-PR-2782-from-beta ([#3160](https://github.com/webex/webex-js-sdk/issues/3160)) ([1acaac5](https://github.com/webex/webex-js-sdk/commit/1acaac5b1b3a3029882fd74c21c92dfcc41ee589))
+
+### [2.59.4](https://github.com/webex/webex-js-sdk/compare/v2.59.3...v2.59.4) (2023-10-10)
+
+
+### Bug Fixes
+
+* **plugin-meetings:** enable adhoc and unified space meeting by default  ([#3137](https://github.com/webex/webex-js-sdk/issues/3137)) ([36c6022](https://github.com/webex/webex-js-sdk/commit/36c602292fbe5155fea3d2ef938c99e43443a2bc))
+
+### [2.59.3](https://github.com/webex/webex-js-sdk/compare/v2.59.2...v2.59.3) (2023-09-06)
+
+
+### Bug Fixes
+
+* **meeting:** added noFramesSent noVideoEncoded events ([#3041](https://github.com/webex/webex-js-sdk/issues/3041)) ([d0c3188](https://github.com/webex/webex-js-sdk/commit/d0c31884fddd0ebff575dcf422a30adb3e542632))
+
+### [2.59.2](https://github.com/webex/webex-js-sdk/compare/v2.59.1...v2.59.2) (2023-08-28)
+
+
+### Bug Fixes
+
+* **plugin-meetings:** no-frames-received-sent-stats-error ([#3017](https://github.com/webex/webex-js-sdk/issues/3017)) ([8c8cb6e](https://github.com/webex/webex-js-sdk/commit/8c8cb6e188d48f1b081e3eb4c7d5447eee40a315))
+
+### [2.59.1](https://github.com/webex/webex-js-sdk/compare/v2.59.0...v2.59.1) (2023-08-14)
+
+
+### Bug Fixes
+
+* **plugin-meetings:** added error for transcription not starting when guest joins first ([#2993](https://github.com/webex/webex-js-sdk/issues/2993)) ([68fc86b](https://github.com/webex/webex-js-sdk/commit/68fc86bfef4eedd191b916436171e8fac2c1271c))
+
 ## [2.59.0](https://github.com/webex/webex-js-sdk/compare/v2.58.1...v2.59.0) (2023-07-24)
 
 

CONTRIBUTING.md

@@ -2,6 +2,7 @@
 
 > ## Note: The master branch is being locked, and there won't be any more releases from that branch. Kindly initiate new pull requests against the next branch instead.
 
+
 We'd love for you to contribute to our source code and to make **Webex Javascript SDK** even better than it is today!
 If you would like to contribute to this repository by adding features, enhancements or bug fixes, you must follow our process: