change author email
merge