removed footer info
fixed merge conflict
moved media links in footer