Fix merge errors on CHANGELOG

Can't show this merge request because the source branch github/fork/mavimo/patch-5 is missing from project import-export-testing-group/gitlabhq_1643245269. Close this merge request or update the source branch.