added
merged template wrap