Fix latest merge