Correct minor changelog merge issue

Correct a merge issue in the change log - some lines got out of sync