merged our two templates in one