Add latest merges to CHANGELOG