fixed author mail
merge