updated changelog
merge fix