Page
Resolve conflict
Conflict resolved
Update email address