update CHANGELOG / Version
merge