added spotlight
mege conflict