Fix changelog merge regression.