Fix CHANGELOG.md merge conflicts (#257)

* fixed changelog entry

* Properly organize changelog entries under correct version headers

- 14.3.3: nullable Field and Roles schemas fix
- 14.3.2: filesApi.downloadFile fix
- 14.3.1: FieldResponse schema fix (GetField)
- 14.3.0: is_archived field addition
- 14.2.1: OAuth v2 Configuration fix

Resolved merge conflicts and distributed all changes to their correct versions.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>

Author: nikita-masalov

CHANGELOG.md

@@ -5,31 +5,32 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-### Fixed
-<<<<<<< HEAD
-- Prepared `nullable: true` to fields that can return null values in schemas for Field and Roles schemas
-=======
-<<<<<<< HEAD
-- Fixed return type for `filesApi.downloadFile` function
-=======
-- Corrected `FieldResponse` schema to use `GetField` instead of `Field` to ensure GET responses accurately reflect all field types returned by the API
->>>>>>> origin/master
->>>>>>> origin/master
-## Added
-- Added `is_archived` field in search response schemas for deals and leads
-### Fixed
--   Fixed PHP SDK v2 Configuration to use correct `/v2` API endpoints after OAuth token refresh instead of defaulting to `/v1`
 
 ## [14.3.3](https://github.com/pipedrive/client-php/compare/14.3.2...14.3.3) (2025-11-18)
 
+### Fixed
+- Prepared `nullable: true` to fields that can return null values in schemas for Field and Roles schemas
+
 ## [14.3.2](https://github.com/pipedrive/client-php/compare/14.3.1...14.3.2) (2025-11-18)
 
+### Fixed
+- Fixed return type for `filesApi.downloadFile` function
+
 ## [14.3.1](https://github.com/pipedrive/client-php/compare/14.3.0...14.3.1) (2025-11-18)
 
+### Fixed
+- Corrected `FieldResponse` schema to use `GetField` instead of `Field` to ensure GET responses accurately reflect all field types returned by the API
+
 ## [14.3.0](https://github.com/pipedrive/client-php/compare/14.2.1...14.3.0) (2025-10-06)
 
+### Added
+- Added `is_archived` field in search response schemas for deals and leads
+
 ## [14.2.1](https://github.com/pipedrive/client-php/compare/14.2.0...14.2.1) (2025-10-03)
 
+### Fixed
+- Fixed PHP SDK v2 Configuration to use correct `/v2` API endpoints after OAuth token refresh instead of defaulting to `/v1`
+
 ## [14.2.0](https://github.com/pipedrive/client-php/compare/14.1.0...14.2.0) (2025-10-03)
 
 ## [14.1.0](https://github.com/pipedrive/client-php/compare/14.0.0...14.1.0) (2025-10-03)