add header and footer and banner
removed conflicts