update email and resolve conflict