Changelog additions
Fix conflict