update changelog
merge