added entry to changelog for latest merge