fixed broken changelog in previous merge