footer changes
merge fix