fixing aws config to send email
fixing conflict