refactoring
removed merge of the templates