Fixed yet another merge error.