Creating template
merging changes