Move changelog entry to the top and fix conflict [ci skip]