actionmailer
conflicts resolved for swami action mailer