merging with latest template