merge
merge
fixing merge issues
Point lights and parallel lights with attn