Fix another merge mistake