fixed email in table
merge errors