consolidating CHANGELOG