Fixed side scrolly issue
merge conflict