working lighting
resolved conflicts