updated scroll fix
merge oops