disabled email image
fixed merge conflict on action mailer