Changelog merge conflicts blocking PRs

[Mossaka]

Changelog merge conflicts are currently blocking the merging of pull requests. This is causing delays in the development workflow. Need a solution to prevent changelog merge conflicts from blocking PRs in the future.

[github-actions]

Agentic Issue Triage triggered by this issue.