fix git author/email
merge