updated changelog
updated changelog - merge