fix conflicts
Game with Spot light
Gems with Pointlight
fix conflict
fix conflicts