footer sticking and updated
fixed merge conflicts