add main email
change color
change mail group for testing
resolved conflicts