add update email templates
merge from remote
local changes