changed mail settings, we were getting errors from gmail
Fixing merge conflicts