Creating template
Merged conflicts