edited templates
merged