fixed conflicts for footer theming
fixing conflicts