footer update - might be css conflicts :(
merge conflict