correct error in previous merge