merge and update CHANGELOG