fix scrolling issue
merge conflicts