CHANGELOG merge=union