Cleanup Changelog merge lines