derp

missed a merge error