Fix merge error and actually apply added lightsources