Fixes issue with changelog merge