merge CHANGELOG