Conflict fix again

Missed a thing in the last conflict fix