merged ChangeLog