lightsensor on a stick
conflicts resolved