Merge + template work