footer fixed
merge conflicts fixed