Template integration and changes in layout and sidebars
Change in style, creation of new pages
bundle update and conflict solved