ensure that prexisting properties are merged back in after a template is parsed.
updates to work with changes in load-templates