solved light merge conflict