update changelog
merge from github repo