another merge mistake to fix