footer changes merge with master