corrections to previous merge