edits to changelog, for merge teting