Add light
smooth scroll
merge