Fix an ancient CHANGELOG conflict