Fixed another merge deep.