added mail settings to secrets.example
Fix merge conflicts.