Merge the template package into main and remove the confd package