Creating template
Fixing merge