fixed smooth scroll
fixed merge conflict