merged dist templates and app templates