email templates updaets
conflict fixes