Add email in header
Resolve conflict