reset author
merge