manual merge + additional template