smooth scroll
conflict resolved