Configured app for Production emails
fixed merge conflict