added migation to connect template and layout
merge conflicts