More updates to the mergeTemplate problem