fix bad merge in changelog