Cleanup CHANGELOG
resolved merge conflict and some white-space fixes
We’ve updated our runner tagging system. If you’re using our shared runners for your CI pipelines, please review the new tags here: https://docs.mpcdf.mpg.de/bnb/220.html#new-tags-for-mpcdf-gitlab-runners
The old tags will remain valid until the end of February 2026.
resolved merge conflict and some white-space fixes