Clean up changelog to get rid of some merging confusion.