Fix previous merge conflict correctly

The previous resolution resulted in a NameError.