template udpates
merge