missed conflict fix in previous merge