Creating template
Fix merge conflicts