resolved merge conflict in new contact template