style test page
remove footer from being global
fix merge conflict