Configured app for Production emails
Resolved merge conflicts.