Creating template
fix merge