changelog change to accommodate conflict since having issues with hg merging