- fix conflict for watermarks - when import to override a template and template's new name is not valid, set a valid one