Update CHANGES to reflect commits from merges