Creating template
resolved merge conflicts