fixed email
merge