Creating template
Resolve conflicts from glittry-banas