add CHANGELOG for merged fixes