footer scroll fix
merge