fix scrolling issue
merge