Creating template
Fix merge conflict