updates changelog prior to merge into master