added default template decision
resolved merge conflict