merge email-templates from spree 2.4