[spacemacs] merge new template changes