add email.go
resolved conflict