modify author
merge