correct previous merge error.