getting changes
merged new template